From bcd750fa2e9b1a23e5cadfe08a906a69d6f50dca Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 21 Dec 2018 17:03:27 +0100 Subject: [PATCH] dbus-spawn-win.c: Don't wait for babysitter thread to start Now that we start the spawned program from the main thread, there is no need to wait for it before dereferencing `sitter->child_handle`. Signed-off-by: Ralf Habacker --- dbus/dbus-spawn-win.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c index 9cfdf478f..1cbe84cb8 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -61,9 +61,6 @@ struct DBusBabysitter { DBusAtomic refcount; - - HANDLE start_sync_event; - char *log_name; HANDLE thread_handle; @@ -110,13 +107,6 @@ _dbus_babysitter_new (void) _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, __FUNCTION__); - sitter->start_sync_event = CreateEvent (NULL, FALSE, FALSE, NULL); - if (sitter->start_sync_event == NULL) - { - _dbus_babysitter_unref (sitter); - return NULL; - } - sitter->child_handle = NULL; sitter->socket_to_babysitter = sitter->socket_to_main = _dbus_socket_get_invalid (); @@ -218,13 +208,6 @@ _dbus_babysitter_unref (DBusBabysitter *sitter) if (sitter->watches) _dbus_watch_list_free (sitter->watches); - if (sitter->start_sync_event != NULL) - { - PING(); - CloseHandle (sitter->start_sync_event); - sitter->start_sync_event = NULL; - } - if (sitter->thread_handle) { CloseHandle (sitter->thread_handle); @@ -570,8 +553,6 @@ babysitter (void *parameter) DBusBabysitter *sitter = (DBusBabysitter *) parameter; PING(); - SetEvent (sitter->start_sync_event); - if (sitter->child_handle != NULL) { DWORD status; @@ -716,9 +697,6 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p, goto out0; } - PING(); - WaitForSingleObject (sitter->start_sync_event, INFINITE); - PING(); if (sitter_p != NULL) *sitter_p = sitter; -- 2.47.3