From 168d7785fc2c13bca530c20b2015042903484b48 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 15 Mar 2004 02:47:35 +0000 Subject: * cygtls.cc (_cygtls::remove): Call remove_wq even when we can't necessarily get the cygtls table lock. * cygtls.h (_cygtls::remove_wq): Add wait argument. * sigproc.cc (_cygtls::remove_wq): Honor wait argument when acquiring lock. (proc_terminate): Don't NULL sync_proc_subproc since other threads may still try to access it. --- winsup/cygwin/cygtls.cc | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'winsup/cygwin/cygtls.cc') diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index f9770bbb0..f6f470634 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -150,19 +150,22 @@ void _cygtls::remove (DWORD wait) { debug_printf ("wait %p\n", wait); - sentry here (wait); - if (here.acquired ()) + do { - for (size_t i = 0; i < nthreads; i++) - if (this == cygheap->threadlist[i]) - { - if (i < --nthreads) - cygheap->threadlist[i] = cygheap->threadlist[nthreads]; - debug_printf ("removed %p element %d", this, i); - remove_wq (); - break; - } - } + sentry here (wait); + if (here.acquired ()) + { + for (size_t i = 0; i < nthreads; i++) + if (this == cygheap->threadlist[i]) + { + if (i < --nthreads) + cygheap->threadlist[i] = cygheap->threadlist[nthreads]; + debug_printf ("removed %p element %d", this, i); + break; + } + } + } while (0); + remove_wq (wait); } void -- cgit v1.2.3