diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-09-23 03:35:41 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-09-23 03:35:41 +0000 |
| commit | 936e4018b6fd1ad21ac528cf567fa81a46b054b0 (patch) | |
| tree | 006c51049b5d80576f8dba9cfc0e7bb71d65db4f /winsup/cygwin/pinfo.cc | |
| parent | 4340c43955131ac445d4d6e9b5fee36b1168ed9c (diff) | |
| download | cygnal-936e4018b6fd1ad21ac528cf567fa81a46b054b0.tar.gz cygnal-936e4018b6fd1ad21ac528cf567fa81a46b054b0.tar.bz2 cygnal-936e4018b6fd1ad21ac528cf567fa81a46b054b0.zip | |
* cygheap.cc (cygheap_fixup_in_child): It's not just for exec.
* cygtls.h (struct _cygtls::thread_handle): New field.
* dcrt0.cc (exit_lock): Remove declaration.
* winsup.h (exit_lock): Add declaration.
* exceptions.cc (sigpacket::process): Properly return after signal_exit.
* pinfo.cc (pinfo::exit): Only exit the process if _my_tls.thread_handle has
not been filled out -- which should be an impossible event.
* sigproc.cc (sigproc_terminate): Fillout _my_tls.thread_handle to provide
something for wait_sig to wait for. Use the siginfo_t version of sig_send and
fill out the tls argument with _my_tls.
(wait_sig): Wait for the thread specified in pack.tls or (for now) complain
bitterly if it doesn't exit.
Diffstat (limited to 'winsup/cygwin/pinfo.cc')
| -rw-r--r-- | winsup/cygwin/pinfo.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 78964a486..1d7b837cb 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -140,6 +140,7 @@ pinfo::zap_cwd () void pinfo::exit (DWORD n) { + EnterCriticalSection (&exit_lock); cygthread::terminate (); if (n != EXITCODE_NOSET) self->exitcode = EXITCODE_SET | n;/* We're really exiting. Record the UNIX exit code. */ @@ -152,7 +153,7 @@ pinfo::exit (DWORD n) sigproc_terminate (ES_FINAL); /* FIXME: There is a potential race between an execed process and its - parent here. I hated to add a mutex just for this, though. */ + parent here. I hated to add a mutex just for that, though. */ struct rusage r; fill_rusage (&r, hMainProc); add_rusage (&self->rusage_self, &r); @@ -169,27 +170,16 @@ pinfo::exit (DWORD n) _my_tls.stacklock = 0; _my_tls.stackptr = _my_tls.stack; - if (&_my_tls == _main_tls) + if (_my_tls.thread_handle) { sigproc_printf ("Calling ExitThread hProcess %p, n %p, exitcode %p", hProcess, n, exitcode); ExitThread (exitcode); } - else if (hMainThread) - { -#if 0 /* This would be nice, but I don't think that Windows guarantees that - TerminateThread will not block. */ - sigproc_printf ("Calling TerminateThread since %p != %p, %p, n %p, exitcode %p", - &_my_tls, _main_tls, hProcess, n, exitcode); - TerminateThread (hMainThread, exitcode); - if (&_my_tls != _sig_tls) - ExitThread (0); -#endif - } sigproc_printf ("Calling ExitProcess since hMainthread is 0, hProcess %p, n %p, exitcode %p", hProcess, n, exitcode); - // release (); Could race with signal thread. Sigh. + release (); ExitProcess (exitcode); } # undef self |