diff options
author | Christopher Faylor <me@cgf.cx> | 2004-12-22 19:59:03 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2004-12-22 19:59:03 +0300 |
commit | 9bc36097c9a1aaeb2665a5bb28c4b84246970f60 (patch) | |
tree | dbda810383fea9fecd5c4538af0991ab1e879e65 /winsup/cygwin/cygthread.cc | |
parent | 9c0d960d7fd60493bc5336061bb65ba02f8dbdbe (diff) |
* pinfo.cc (proc_waiter): Zero wait_thread in child to avoid races with process
termination.
* cygthread.cc (cygthread::terminate): Clumsily detect when h has gone away and
attempt no further action.
Diffstat (limited to 'winsup/cygwin/cygthread.cc')
-rw-r--r-- | winsup/cygwin/cygthread.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc index d20bf6853..80fc5e0cc 100644 --- a/winsup/cygwin/cygthread.cc +++ b/winsup/cygwin/cygthread.cc @@ -226,18 +226,33 @@ cygthread::release () void cygthread::terminate_thread () { + /* FIXME: The if (!h) stuff below should be handled better. The + problem is that terminate_thread could be called while a thread + is terminating and either the thread could be handling its own + release or, if this is being called during exit, some other + thread may be attempting to free up this resource. In the former + case, setting some kind of "I deal with my own exit" type of + flag may be the way to handle this. */ if (!is_freerange) { ResetEvent (*this); ResetEvent (thread_sync); } + if (!h) + return; (void) TerminateThread (h, 0); (void) WaitForSingleObject (h, INFINITE); + if (!h) + return; + CloseHandle (h); - while (!stack_ptr) + while (h && !stack_ptr) low_priority_sleep (0); + if (!h) + return; + MEMORY_BASIC_INFORMATION m; memset (&m, 0, sizeof (m)); (void) VirtualQuery (stack_ptr, &m, sizeof m); |