#include "dbus-server-unix.h"
#include "dbus-server-socket.h"
#include "dbus-string.h"
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-server-debug-pipe.h"
#endif
#include "dbus-address.h"
* @{
*/
+#ifndef _dbus_server_trace_ref
+void
+_dbus_server_trace_ref (DBusServer *server,
+ int old_refcount,
+ int new_refcount,
+ const char *why)
+{
+ static int enabled = -1;
+
+ _dbus_trace_ref ("DBusServer", server, old_refcount, new_refcount, why,
+ "DBUS_SERVER_TRACE", &enabled);
+}
+#endif
+
/* this is a little fragile since it assumes the address doesn't
* already have a guid, but it shouldn't
*/
if (server->address == NULL)
goto failed;
- _dbus_mutex_new_at_location (&server->mutex);
+ _dbus_rmutex_new_at_location (&server->mutex);
if (server->mutex == NULL)
goto failed;
return TRUE;
failed:
- _dbus_mutex_free_at_location (&server->mutex);
+ _dbus_rmutex_free_at_location (&server->mutex);
server->mutex = NULL;
if (server->watches)
{
return FALSE;
}
+#ifdef ENABLE_KDBUS_TRANSPORT
+static void mini_vtable_dummy_func(DBusServer *server)
+{
+ // Used to prevent assert errors. Pointer to function is passed to
+ // DBusServerVTable which is passed to server->vtable in
+ // dbus_server_init_mini function.
+}
+
+DBusServer*
+dbus_server_init_mini (char* address)
+{
+ DBusServer *server;
+
+ static const DBusServerVTable dbus_server_init_mini_vtable = {
+ mini_vtable_dummy_func,
+ mini_vtable_dummy_func
+ };
+
+ server = dbus_new0(struct DBusServer, 1);
+ if(server == NULL)
+ return NULL;
+
+ memset(server, 0, sizeof(struct DBusServer));
+ _dbus_rmutex_new_at_location (&server->mutex);
+ if (server->mutex == NULL)
+ goto failed;
+ server->address = address;
+
+ server->vtable = &dbus_server_init_mini_vtable;
+
+ _dbus_atomic_inc (&server->refcount);
+
+ server->watches = _dbus_watch_list_new ();
+ if (server->watches == NULL)
+ goto failed;
+
+ server->timeouts = _dbus_timeout_list_new();
+ if (server->timeouts == NULL)
+ goto failed;
+
+ return server;
+
+failed:
+ dbus_free(server);
+ return NULL;
+}
+#endif
+
+
/**
* Finalizes the members of the DBusServer base class.
* Chained up to by subclass finalizers.
_dbus_watch_list_free (server->watches);
_dbus_timeout_list_free (server->timeouts);
- _dbus_mutex_free_at_location (&server->mutex);
+ _dbus_rmutex_free_at_location (&server->mutex);
dbus_free (server->address);
void
_dbus_server_ref_unlocked (DBusServer *server)
{
+ dbus_int32_t old_refcount;
+
_dbus_assert (server != NULL);
HAVE_LOCK_CHECK (server);
-#ifdef DBUS_DISABLE_ASSERT
- _dbus_atomic_inc (&server->refcount);
-#else
- {
- dbus_int32_t old_refcount = _dbus_atomic_inc (&server->refcount);
-
- _dbus_assert (old_refcount > 0);
- }
-#endif
+ old_refcount = _dbus_atomic_inc (&server->refcount);
+ _dbus_assert (old_refcount > 0);
+ _dbus_server_trace_ref (server, old_refcount, old_refcount + 1,
+ "ref_unlocked");
}
/**
old_refcount = _dbus_atomic_dec (&server->refcount);
_dbus_assert (old_refcount > 0);
+ _dbus_server_trace_ref (server, old_refcount, old_refcount - 1,
+ "unref_unlocked");
+
if (old_refcount == 1)
{
_dbus_assert (server->disconnected);
} listen_funcs[] = {
{ _dbus_server_listen_socket }
, { _dbus_server_listen_platform_specific }
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
, { _dbus_server_listen_debug_pipe }
#endif
};
DBusServer *
dbus_server_ref (DBusServer *server)
{
- _dbus_return_val_if_fail (server != NULL, NULL);
+ dbus_int32_t old_refcount;
-#ifdef DBUS_DISABLE_CHECKS
- _dbus_atomic_inc (&server->refcount);
-#else
- {
- dbus_int32_t old_refcount;
+ _dbus_return_val_if_fail (server != NULL, NULL);
- /* can't get the refcount without a side-effect */
- old_refcount = _dbus_atomic_inc (&server->refcount);
+ old_refcount = _dbus_atomic_inc (&server->refcount);
- if (_DBUS_UNLIKELY (old_refcount <= 0))
- {
- /* undo side-effect first */
- _dbus_atomic_dec (&server->refcount);
- _dbus_warn_check_failed (_dbus_return_if_fail_warning_format,
- _DBUS_FUNCTION_NAME, "old_refcount > 0",
- __FILE__, __LINE__);
- return NULL;
- }
+#ifndef DBUS_DISABLE_CHECKS
+ if (_DBUS_UNLIKELY (old_refcount <= 0))
+ {
+ _dbus_atomic_dec (&server->refcount);
+ _dbus_warn_check_failed (_dbus_return_if_fail_warning_format,
+ _DBUS_FUNCTION_NAME, "old_refcount > 0",
+ __FILE__, __LINE__);
+ return NULL;
}
#endif
+ _dbus_server_trace_ref (server, old_refcount, old_refcount + 1, "ref");
+
return server;
}
_dbus_return_if_fail (server != NULL);
- /* can't get the refcount without a side-effect */
old_refcount = _dbus_atomic_dec (&server->refcount);
#ifndef DBUS_DISABLE_CHECKS
if (_DBUS_UNLIKELY (old_refcount <= 0))
{
- /* undo side-effect first */
+ /* undo side-effect first
+ * please do not try to simplify the code here by using
+ * _dbus_atomic_get(), why we don't use it is
+ * because it issues another atomic operation even though
+ * DBUS_DISABLE_CHECKS defined.
+ * Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303
+ */
_dbus_atomic_inc (&server->refcount);
_dbus_warn_check_failed (_dbus_return_if_fail_warning_format,
_DBUS_FUNCTION_NAME, "old_refcount > 0",
}
#endif
+ _dbus_server_trace_ref (server, old_refcount, old_refcount - 1, "unref");
+
if (old_refcount == 1)
{
/* lock not held! */
{
_dbus_return_if_fail (server != NULL);
-#ifdef DBUS_DISABLE_CHECKS
- _dbus_atomic_inc (&server->refcount);
-#else
- {
- dbus_int32_t old_refcount = _dbus_atomic_inc (&server->refcount);
-
- _dbus_return_if_fail (old_refcount > 0);
- }
-#endif
-
+ dbus_server_ref (server);
SERVER_LOCK (server);
_dbus_assert (server->vtable->disconnect != NULL);
return TRUE;
}
-
-static DBusDataSlotAllocator slot_allocator;
-_DBUS_DEFINE_GLOBAL_LOCK (server_slots);
+static DBusDataSlotAllocator slot_allocator =
+ _DBUS_DATA_SLOT_ALLOCATOR_INIT (_DBUS_LOCK_NAME (server_slots));
/**
* Allocates an integer ID to be used for storing application-specific
dbus_server_allocate_data_slot (dbus_int32_t *slot_p)
{
return _dbus_data_slot_allocator_alloc (&slot_allocator,
- (DBusMutex **)&_DBUS_LOCK_NAME (server_slots),
slot_p);
}
/** @} */
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <string.h>
return TRUE;
}
-#endif /* DBUS_BUILD_TESTS */
+#endif /* DBUS_ENABLE_EMBEDDED_TESTS */