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 /dbus/dbus-server.c | |
| parent | 3caaa342e8db2cba690bb9e1a228ef3862e203d8 (diff) | |
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 'dbus/dbus-server.c')
| -rw-r--r-- | dbus/dbus-server.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index 79ed7ed4..ba48cd97 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -498,12 +498,19 @@ dbus_server_set_timeout_functions (DBusServer *server, * Called to notify the server when a previously-added watch * is ready for reading or writing, or has an exception such * as a hangup. + * + * If this function returns #FALSE, then the file descriptor may still + * be ready for reading or writing, but more memory is needed in order + * to do the reading or writing. If you ignore the #FALSE return, your + * application may spin in a busy loop on the file descriptor until + * memory becomes available, but nothing more catastrophic should + * happen. * * @param server the server. * @param watch the watch. * @param condition the current condition of the file descriptors being watched. */ -void +dbus_bool_t dbus_server_handle_watch (DBusServer *server, DBusWatch *watch, unsigned int condition) @@ -512,7 +519,7 @@ dbus_server_handle_watch (DBusServer *server, _dbus_watch_sanitize_condition (watch, &condition); - (* server->vtable->handle_watch) (server, watch, condition); + return (* server->vtable->handle_watch) (server, watch, condition); } /** |