From: John (J5) Palmieri Date: Wed, 9 Aug 2006 19:45:24 +0000 (+0000) Subject: * Change an assert to a detailed warning and abort. X-Git-Tag: dbus-0.92~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5628ef82de9e853381ab61bab8c3cd3b1b622290;p=platform%2Fupstream%2Fdbus.git * Change an assert to a detailed warning and abort. When allocator->lock != mutex it indicates that the user has failed to initalize threads before using the D-Bus library. This warning helps the user identify the issue and fix their app. --- diff --git a/ChangeLog b/ChangeLog index fe7696e..fe0ddbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-09 John (J5) Palmieri + + * dbus/dbus-dataslot.c (_dbus_data_slot_allocator_alloc): + Change an assert to a detailed warning and abort. + When allocator->lock != mutex it indicates that the user has failed + to initalize threads before using the D-Bus library. This warning + helps the user identify the issue and fix their app. + 2006-08-08 John (J5) Palmieri These are all patches from Kjartan Maraas diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c index 8a2937d..8b1bbb8 100644 --- a/dbus/dbus-dataslot.c +++ b/dbus/dbus-dataslot.c @@ -78,8 +78,11 @@ _dbus_data_slot_allocator_alloc (DBusDataSlotAllocator *allocator, _dbus_assert (allocator->lock == NULL); allocator->lock = mutex; } - else - _dbus_assert (allocator->lock == mutex); + else if (allocator->lock != mutex) + { + _dbus_warn ("D-Bus threads were initialized after first using the D-Bus library. If your application does not directly initialize threads or use D-Bus, keep in mind that some library or plugin may have used D-Bus or initialized threads behind your back. You can often fix this problem by calling dbus_init_threads() or dbus_g_threads_init() early in your main() method, before D-Bus is used."); + _dbus_abort (); + } if (*slot_id_p >= 0) {