diff options
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/connection.c | 14 | ||||
| -rw-r--r-- | bus/dispatch.c | 76 | ||||
| -rw-r--r-- | bus/expirelist.c | 17 | ||||
| -rw-r--r-- | bus/expirelist.h | 6 |
4 files changed, 82 insertions, 31 deletions
diff --git a/bus/connection.c b/bus/connection.c index db9cbaa8..71102db1 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -80,9 +80,9 @@ typedef struct int stamp; /**< connections->stamp last time we were traversed */ } BusConnectionData; -static void bus_pending_reply_expired (BusExpireList *list, - DBusList *link, - void *data); +static dbus_bool_t bus_pending_reply_expired (BusExpireList *list, + DBusList *link, + void *data); static void bus_connection_drop_pending_replies (BusConnections *connections, DBusConnection *connection); @@ -1392,7 +1392,7 @@ bus_pending_reply_send_no_reply (BusConnections *connections, return retval; } -static void +static dbus_bool_t bus_pending_reply_expired (BusExpireList *list, DBusList *link, void *data) @@ -1414,20 +1414,22 @@ bus_pending_reply_expired (BusExpireList *list, transaction = bus_transaction_new (connections->context); if (transaction == NULL) - return; + return FALSE; if (!bus_pending_reply_send_no_reply (connections, transaction, pending)) { bus_transaction_cancel_and_free (transaction); - return; + return FALSE; } _dbus_list_remove_link (&connections->pending_replies->items, link); bus_pending_reply_free (pending); bus_transaction_execute_and_free (transaction); + + return TRUE; } static void diff --git a/bus/dispatch.c b/bus/dispatch.c index 26dd4fc8..c5331915 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -415,16 +415,20 @@ warn_unexpected_real (DBusConnection *connection, const char *function, int line) { - _dbus_warn ("%s:%d received message interface \"%s\" member \"%s\" error name \"%s\" on %p, expecting %s\n", - function, line, - dbus_message_get_interface (message) ? - dbus_message_get_interface (message) : "(unset)", - dbus_message_get_member (message) ? - dbus_message_get_member (message) : "(unset)", - dbus_message_get_error_name (message) ? - dbus_message_get_error_name (message) : "(unset)", - connection, - expected); + if (message) + _dbus_warn ("%s:%d received message interface \"%s\" member \"%s\" error name \"%s\" on %p, expecting %s\n", + function, line, + dbus_message_get_interface (message) ? + dbus_message_get_interface (message) : "(unset)", + dbus_message_get_member (message) ? + dbus_message_get_member (message) : "(unset)", + dbus_message_get_error_name (message) ? + dbus_message_get_error_name (message) : "(unset)", + connection, + expected); + else + _dbus_warn ("%s:%d received no message on %p, expecting %s\n", + function, line, connection, expected); } #define warn_unexpected(connection, message, expected) \ @@ -1428,12 +1432,6 @@ check_service_deactivated (BusContext *context, if (csdd.failed) goto out; - - if (!check_no_leftovers (context)) - { - _dbus_warn ("Messages were left over after verifying results of service exiting\n"); - goto out; - } retval = TRUE; @@ -1519,6 +1517,13 @@ check_send_exit_to_service (BusContext *context, message = pop_message_waiting_for_memory (connection); _dbus_assert (message != NULL); + if (dbus_message_get_reply_serial (message) != serial) + { + warn_unexpected (connection, message, + "error with the correct reply serial"); + goto out; + } + if (!dbus_message_is_error (message, DBUS_ERROR_NO_MEMORY)) { @@ -1540,8 +1545,45 @@ check_send_exit_to_service (BusContext *context, if (!check_service_deactivated (context, connection, service_name, base_service)) goto out; - } + /* Should now have a NoReply error from the Exit() method + * call; it should have come after all the deactivation + * stuff. + */ + message = pop_message_waiting_for_memory (connection); + + if (message == NULL) + { + warn_unexpected (connection, NULL, + "reply to Exit() method call"); + goto out; + } + if (!dbus_message_is_error (message, + DBUS_ERROR_NO_REPLY)) + { + warn_unexpected (connection, NULL, + "NoReply error from Exit() method call"); + goto out; + } + + if (dbus_message_get_reply_serial (message) != serial) + { + warn_unexpected (connection, message, + "error with the correct reply serial"); + goto out; + } + + _dbus_verbose ("Got error %s after test service exited\n", + dbus_message_get_error_name (message)); + + if (!check_no_leftovers (context)) + { + _dbus_warn ("Messages were left over after %s\n", + _DBUS_FUNCTION_NAME); + goto out; + } + } + retval = TRUE; out: diff --git a/bus/expirelist.c b/bus/expirelist.c index a1ce226d..3725bdd9 100644 --- a/bus/expirelist.c +++ b/bus/expirelist.c @@ -143,11 +143,16 @@ do_expiration_with_current_time (BusExpireList *list, _dbus_verbose ("Expiring an item %p\n", item); /* If the expire function fails, we just end up expiring - * this item next time we walk through the list. Which is in - * indeterminate time since we don't know what next_interval - * will be. + * this item next time we walk through the list. This would + * be an indeterminate time normally, so we set up the + * next_interval to be "shortly" (just enough to avoid + * a busy loop) */ - (* list->expire_func) (list, link, list->data); + if (!(* list->expire_func) (list, link, list->data)) + { + next_interval = _dbus_get_oom_wait (); + break; + } } else { @@ -205,7 +210,7 @@ typedef struct int expire_count; } TestExpireItem; -static void +static dbus_bool_t test_expire_func (BusExpireList *list, DBusList *link, void *data) @@ -215,6 +220,8 @@ test_expire_func (BusExpireList *list, t = (TestExpireItem*) link->data; t->expire_count += 1; + + return TRUE; } static void diff --git a/bus/expirelist.h b/bus/expirelist.h index c843a446..e534e8d9 100644 --- a/bus/expirelist.h +++ b/bus/expirelist.h @@ -31,9 +31,9 @@ typedef struct BusExpireList BusExpireList; typedef struct BusExpireItem BusExpireItem; -typedef void (* BusExpireFunc) (BusExpireList *list, - DBusList *link, - void *data); +typedef dbus_bool_t (* BusExpireFunc) (BusExpireList *list, + DBusList *link, + void *data); struct BusExpireList { |