fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-06-04 12:08:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.10'

Browse source
This commit is contained in:
Ralf Habacker 2016-05-13 15:32:44 +02:00
commit 8c0d598029
3 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dbus/dbus-internals.h
View file

@ -124,6 +124,7 @@ static void _dbus_verbose(const char * x,...) {;}
# define _dbus_is_verbose() FALSE # define _dbus_is_verbose() FALSE
#endif /* !DBUS_ENABLE_VERBOSE_MODE */ #endif /* !DBUS_ENABLE_VERBOSE_MODE */
DBUS_PRIVATE_EXPORT
void _dbus_trace_ref (const char *obj_name, void _dbus_trace_ref (const char *obj_name,
void *obj, void *obj,
int old_refcount, int old_refcount,

43
dbus/dbus-spawn-win.c
View file

@ -60,7 +60,7 @@
*/ */
struct DBusBabysitter struct DBusBabysitter
{ {
int refcount; DBusAtomic refcount;
HANDLE start_sync_event; HANDLE start_sync_event;
#ifdef DBUS_ENABLE_EMBEDDED_TESTS #ifdef DBUS_ENABLE_EMBEDDED_TESTS
@ -89,16 +89,33 @@ struct DBusBabysitter
int child_status; int child_status;
}; };
static void
_dbus_babysitter_trace_ref (DBusBabysitter *sitter,
int old_refcount,
int new_refcount,
const char *why)
{
#ifdef DBUS_ENABLE_VERBOSE_MODE
static int enabled = -1;
_dbus_trace_ref ("DBusBabysitter", sitter, old_refcount, new_refcount, why,
"DBUS_BABYSITTER_TRACE", &enabled);
#endif
}
static DBusBabysitter* static DBusBabysitter*
_dbus_babysitter_new (void) _dbus_babysitter_new (void)
{ {
DBusBabysitter *sitter; DBusBabysitter *sitter;
dbus_int32_t old_refcount;
sitter = dbus_new0 (DBusBabysitter, 1); sitter = dbus_new0 (DBusBabysitter, 1);
if (sitter == NULL) if (sitter == NULL)
return NULL; return NULL;
sitter->refcount = 1; old_refcount = _dbus_atomic_inc (&sitter->refcount);
_dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, __FUNCTION__);
sitter->start_sync_event = CreateEvent (NULL, FALSE, FALSE, NULL); sitter->start_sync_event = CreateEvent (NULL, FALSE, FALSE, NULL);
if (sitter->start_sync_event == NULL) if (sitter->start_sync_event == NULL)
@ -146,11 +163,13 @@ _dbus_babysitter_new (void)
DBusBabysitter * DBusBabysitter *
_dbus_babysitter_ref (DBusBabysitter *sitter) _dbus_babysitter_ref (DBusBabysitter *sitter)
{ {
dbus_int32_t old_refcount;
PING(); PING();
_dbus_assert (sitter != NULL); _dbus_assert (sitter != NULL);
_dbus_assert (sitter->refcount > 0);
sitter->refcount += 1; old_refcount = _dbus_atomic_inc (&sitter->refcount);
_dbus_assert (old_refcount > 0);
_dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, __FUNCTION__);
return sitter; return sitter;
} }
@ -185,14 +204,16 @@ void
_dbus_babysitter_unref (DBusBabysitter *sitter) _dbus_babysitter_unref (DBusBabysitter *sitter)
{ {
int i; int i;
dbus_int32_t old_refcount;
PING(); PING();
_dbus_assert (sitter != NULL); _dbus_assert (sitter != NULL);
_dbus_assert (sitter->refcount > 0);
sitter->refcount -= 1; old_refcount = _dbus_atomic_dec (&sitter->refcount);
_dbus_assert (old_refcount > 0);
_dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount-1, __FUNCTION__);
if (sitter->refcount == 0) if (old_refcount == 1)
{ {
close_socket_to_babysitter (sitter); close_socket_to_babysitter (sitter);
@ -584,7 +605,11 @@ babysitter (void *parameter)
DBusBabysitter *sitter = (DBusBabysitter *) parameter; DBusBabysitter *sitter = (DBusBabysitter *) parameter;
PING(); PING();
_dbus_babysitter_ref (sitter); if (sitter->child_setup)
{
PING();
(*sitter->child_setup) (sitter->user_data);
}
_dbus_verbose ("babysitter: spawning %s\n", sitter->log_name); _dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
@ -717,7 +742,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
PING(); PING();
sitter_thread = (HANDLE) CreateThread (NULL, 0, babysitter, sitter_thread = (HANDLE) CreateThread (NULL, 0, babysitter,
sitter, 0, &sitter_thread_id); _dbus_babysitter_ref (sitter), 0, &sitter_thread_id);
if (sitter_thread == 0) if (sitter_thread == 0)
{ {

3
dbus/dbus-sysdeps.h
View file

@ -296,8 +296,11 @@ struct DBusAtomic
# undef DBUS_HAVE_ATOMIC_INT # undef DBUS_HAVE_ATOMIC_INT
#endif #endif
DBUS_PRIVATE_EXPORT
dbus_int32_t _dbus_atomic_inc (DBusAtomic *atomic); dbus_int32_t _dbus_atomic_inc (DBusAtomic *atomic);
DBUS_PRIVATE_EXPORT
dbus_int32_t _dbus_atomic_dec (DBusAtomic *atomic); dbus_int32_t _dbus_atomic_dec (DBusAtomic *atomic);
DBUS_PRIVATE_EXPORT
dbus_int32_t _dbus_atomic_get (DBusAtomic *atomic); dbus_int32_t _dbus_atomic_get (DBusAtomic *atomic);
#ifdef DBUS_WIN #ifdef DBUS_WIN