From 3f5046a540af860ee6045156becbeb71fa05b220 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 13 Oct 2002 18:16:33 +0000 Subject: * cygthread.cc (cygthread::stub): Don't create event for long-running threads. Initialize thread_sync event here which is used to Suspend using an event rather than relying on SuspendThread/ResumeThread. (cygthread::init): Save handle to runner thread for future termination. (cygthread::cygthread): Only resume thread when it is actually suspended. Otherwise signal thread completion event. (cygthread::terminate): Forcibly terminate runner thread and any helper threads. Call DisableThreadLibrary calls if execing. * cygthread.h (cygthread::thread_sync): Declare. * dcrt0.cc (do_exit): Eliminate calls to obsolete window_terminate and shared_terminate. * exceptions.cc (events_terminate): Don't bother closing title_mutex since it is going away anyway. * pinfo.cc (_pinfo::exit): Call cygthread::terminate to ensure that threads are shut down before process exit or otherwise strange races seem to occur. * shared.cc (shared_terminate): Eliminate. * shared.h (shared_terminate): Eliminate declaration. * winsup.h (window_terminate): Eliminate declaration. * spawn.cc (spawn_guts): Call cygthread::terminate early in process if execing. Call DisableThreadLibrary calls if execing. * window.cc (Winmain): Call ExitThread to force exit. (window_terminate): Eliminate. * dcrt0.cc (do_exit): Track exit state more closely. --- winsup/cygwin/spawn.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/spawn.cc') diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 34927c1f0..b3bf304fb 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -34,6 +34,7 @@ details. */ #include "perthread.h" #include "registry.h" #include "environ.h" +#include "cygthread.h" #define LINE_BUF_CHUNK (MAX_PATH * 2) @@ -715,12 +716,13 @@ spawn_guts (const char * prog_arg, const char *const *argv, cygheap_setup_for_child_cleanup (newheap, &ciresrv, 1); if (mode == _P_OVERLAY) ResumeThread (pi.hThread); + cygthread::terminate (); } - if (mode == _P_OVERLAY) - cygpid = myself->pid; - else + if (mode != _P_OVERLAY) cygpid = cygwin_pid (pi.dwProcessId); + else + cygpid = myself->pid; /* We print the original program name here so the user can see that too. */ syscall_printf ("%d = spawn_guts (%s, %.132s)", -- cgit v1.2.3