From 6be547d32f018c23ba56426a0bccd08baa2cf440 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 11 Apr 2003 00:03:06 +0000 Subject: 2003-04-10 Havoc Pennington * dbus/dbus-connection.c (dbus_connection_flush): don't spin on the connection if it's disconnected * bus/activation.c (bus_activation_service_created): use new transaction features to roll back removal of pending activation if we don't successfully create the service after all. Don't remove pending activation if the function fails. * dbus/dbus-list.c (_dbus_list_insert_before_link) (_dbus_list_insert_after_link): new code to facilitate services.c fixes * dbus/dbus-hash.c (_dbus_hash_table_insert_string_preallocated): new functionality, so we can preallocate the ability to insert into a hash table. * bus/connection.c (bus_transaction_add_cancel_hook): new function allowing us to put custom hooks in a transaction to be used for cancelling said transaction * doc/dbus-specification.sgml: add some discussion of secondary service owners, and disallow zero-length service names * bus/services.c (bus_registry_acquire_service): new function, splits out part of bus_driver_handle_acquire_service() and fixes a bug where we didn't remove the service doing the acquiring from the secondary queue if we failed to remove the current owner from the front of the queue. --- dbus/dbus-spawn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-spawn.c') diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index 87e1ffc2..0e08cd78 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -879,6 +879,8 @@ check_babysit_events (pid_t grandchild_pid, else if (ret == grandchild_pid) { /* Child exited */ + _dbus_verbose ("reaped child pid %ld\n", (long) ret); + write_status_and_exit (parent_pipe, status); } else @@ -890,13 +892,13 @@ check_babysit_events (pid_t grandchild_pid, if (revents & _DBUS_POLLIN) { - /* Data to read from parent */ - + _dbus_verbose ("babysitter got POLLIN from parent pipe\n"); } if (revents & (_DBUS_POLLERR | _DBUS_POLLHUP)) { /* Parent is gone, so we just exit */ + _dbus_verbose ("babysitter got POLLERR or POLLHUP from parent\n"); _exit (0); } } -- cgit