diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-17 01:54:37 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-17 01:54:37 +0000 |
| commit | b4a1100f4f81534e2aac0141afda750f318223d4 (patch) | |
| tree | 9573e47181fc32c40f4784df0d22b2c6ee4143c4 /bus/utils.c | |
| parent | 3caaa342e8db2cba690bb9e1a228ef3862e203d8 (diff) | |
| download | dbus-b4a1100f4f81534e2aac0141afda750f318223d4.tar.gz | |
2003-03-16 Havoc Pennington <hp@pobox.com>
* dbus/dbus-watch.c (_dbus_watch_new): handle failure to malloc
the watch
* dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new):
add some missing dbus_set_result
* bus/dispatch.c (bus_dispatch_add_connection): handle failure to
alloc the DBusMessageHandler
* dbus/dbus-transport.c (_dbus_transport_disconnect): don't ref
the transport here, since we call this from the finalizer; it
resulted in a double-finalize.
* dbus/dbus-transport.c (_dbus_transport_disconnect): fix a bug
where we tried to use transport->connection that was NULL,
happened when transport was disconnected early on due to OOM
* bus/*.c: adapt to handle OOM for watches/timeouts
* dbus/dbus-transport-unix.c: port to handle OOM during
watch handling
* dbus/dbus-auth.c (_dbus_auth_get_unused_bytes): return a
reference to unused bytes instead of a copy
* dbus/dbus-server.c (dbus_server_handle_watch): return FALSE for
out of memory
* dbus/dbus-connection.c (dbus_connection_handle_watch): return
FALSE on OOM
* dbus/dbus-timeout.c (dbus_timeout_handle): return FALSE for out
of memory
Diffstat (limited to 'bus/utils.c')
| -rw-r--r-- | bus/utils.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bus/utils.c b/bus/utils.c index 8a68d8a4..090e27f0 100644 --- a/bus/utils.c +++ b/bus/utils.c @@ -28,18 +28,24 @@ const char bus_no_memory_message[] = "Memory allocation failure in message bus"; -void -bus_wait_for_memory (void) +int +bus_get_oom_wait (void) { #ifdef DBUS_BUILD_TESTS /* make tests go fast */ - _dbus_sleep_milliseconds (10); + return 10; #else - _dbus_sleep_milliseconds (500); + return 500; #endif } void +bus_wait_for_memory (void) +{ + _dbus_sleep_milliseconds (bus_get_oom_wait ()); +} + +void bus_connection_dispatch_all_messages (DBusConnection *connection) { while (bus_connection_dispatch_one_message (connection)) |