diff options
author | Christopher Faylor <me@cgf.cx> | 2005-02-06 08:04:34 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-02-06 08:04:34 +0300 |
commit | 85a798d6e755f4db4c04d92ecde1e5409a62cd59 (patch) | |
tree | f1b1eda0a4f9cdc38c11cd774e5db3e42f1de9cf /winsup/cygwin/cygthread.cc | |
parent | 901b1fb9852e5ccaa66ad82c539447394727f33c (diff) |
* cygthread.h (cygthread::terminate_thread): Reflect return value.
* cygthread.cc (cygthread::detach): Be more careful about ensuring that sigwait
is properly waited for to avoid later missynchronization.
(cygthread::terminate_thread): Return true if thread was actually terminated
and all handles were closed.
* fhandler_base.cc (fhandler_base::raw_read): Use signal_read_state rather than
raw calls to win32 api.
(fhandler_base::read): Ditto.
* fhandler.h (fhandler_pipe::fixup_after_exec): Use method to create read_state
signalling.
(fhandler_pipe::create): Ditto.
* Makefile.in: Make some more files -fomit-frame-pointer.
Diffstat (limited to 'winsup/cygwin/cygthread.cc')
-rw-r--r-- | winsup/cygwin/cygthread.cc | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc index 3f8286a88..c6ae0249c 100644 --- a/winsup/cygwin/cygthread.cc +++ b/winsup/cygwin/cygthread.cc @@ -243,9 +243,10 @@ cygthread::release (bool nuke_h) } /* Forcibly terminate a thread. */ -void +bool cygthread::terminate_thread () { + bool terminated = true; /* FIXME: The if (!inuse) 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 @@ -264,19 +265,19 @@ cygthread::terminate_thread () low_priority_sleep (0); if (!inuse) - return; + return false; (void) TerminateThread (h, 0); (void) WaitForSingleObject (h, INFINITE); if (ev) - WaitForSingleObject (ev, 0); + terminated = WaitForSingleObject (ev, 0) != WAIT_OBJECT_0; if (!inuse || exiting) - return; + return false; CloseHandle (h); if (!inuse) - return; + return false; MEMORY_BASIC_INFORMATION m; memset (&m, 0, sizeof (m)); @@ -299,6 +300,7 @@ cygthread::terminate_thread () #endif release (true); } + return terminated; } /* Detach the cygthread from the current thread. Note that the @@ -309,6 +311,7 @@ bool cygthread::detach (HANDLE sigwait) { bool signalled = false; + bool terminated = false; if (!inuse) system_printf ("called detach but inuse %d, thread %p?", inuse, id); else @@ -327,22 +330,27 @@ cygthread::detach (HANDLE sigwait) system_printf ("WFSO sigwait %p failed, res %u, %E", sigwait, res); res = WaitForMultipleObjects (2, w4, FALSE, INFINITE); if (res == WAIT_OBJECT_0) - /* nothing */; - else if (WaitForSingleObject (sigwait, 0) == WAIT_OBJECT_0) - res = WaitForSingleObject (*this, INFINITE); - else if ((res = WaitForSingleObject (*this, 0)) != WAIT_OBJECT_0) + signalled = false; + else if (res != WAIT_OBJECT_0 + 1) + api_fatal ("WFMO failed waiting for cygthread '%s'", __name); + else if ((res = WaitForSingleObject (*this, INFINITE)) == WAIT_OBJECT_0) + signalled = false; + else { - signalled = true; - terminate_thread (); - set_sig_errno (EINTR); /* caller should be dealing with return - values. */ + terminated = true; + signalled = terminate_thread (); } + if (WaitForSingleObject (sigwait, 0) == WAIT_OBJECT_0) + signalled = false; + else if (signalled) + set_sig_errno (EINTR); /* caller should be dealing with return + values. */ } thread_printf ("%s returns %d, id %p", sigwait ? "WFMO" : "WFSO", res, id); - if (signalled) + if (terminated) /* already handled */; else if (is_freerange) { |