diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-24 03:16:58 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-24 03:16:58 +0000 |
| commit | c3af5ccdbc22e8990d04ec2f89ad1f2e053655e9 (patch) | |
| tree | 6010b0b9a2be255b3ff3ac9f62e4c04ce57aef83 /dbus/dbus-server.c | |
| parent | a26607ab68bf0878f23d2dbddec781b4b760d034 (diff) | |
2003-03-23 Havoc Pennington <hp@pobox.com>
* dbus/dbus-threads.c (dbus_mutex_new, dbus_condvar_new): with
DBUS_BUILD_TESTS, actually alloc/free a block of memory for
the mutex, so we can check for proper memory management
and OOM handling.
* dbus/dbus-dataslot.c: remove the mutex from
DBusDataSlotAllocator and lock it manually when using it,
to simplify fitting it into the global slots framework.
* dbus/dbus-threads.c (init_static_locks): rework how we're
handling global locks so they are easily shut down.
* bus/policy.c (bus_policy_append_rule): fix
* bus/test-main.c (main): check for memleaks
* dbus/dbus-test.c (dbus_internal_do_not_use_run_tests): make
test suite check for memleaks
* dbus/dbus-memory.c: add support in test mode for tracking
number of outstanding blocks
Diffstat (limited to 'dbus/dbus-server.c')
| -rw-r--r-- | dbus/dbus-server.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index ba48cd97..e717096e 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -589,21 +589,7 @@ dbus_server_get_n_connections (DBusServer *server) static DBusDataSlotAllocator slot_allocator; - -/** - * Initialize the mutex used for #DBusConnection data - * slot reservations. - * - * @returns the mutex - */ -DBusMutex * -_dbus_server_slots_init_lock (void) -{ - if (!_dbus_data_slot_allocator_init (&slot_allocator)) - return NULL; - else - return slot_allocator.lock; -} +_DBUS_DEFINE_GLOBAL_LOCK (server_slots); /** * Allocates an integer ID to be used for storing application-specific @@ -618,7 +604,8 @@ _dbus_server_slots_init_lock (void) int dbus_server_allocate_data_slot (void) { - return _dbus_data_slot_allocator_alloc (&slot_allocator); + return _dbus_data_slot_allocator_alloc (&slot_allocator, + _DBUS_LOCK_NAME (server_slots)); } /** |