mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-31 11:30:56 +08:00
* init.cc (dll_entry): Revert previous patch. This requires another
solution. * miscfuncs.cc (thread_wrapper): Ditto. * sigproc.cc (exit_thread): Disable sending a signal for synchronization with process exit. Explain why. Keep code in for later inspection, should the problem show up again. (sig_send): Use "tls", rather than "tid" as name for _cygtls arg.
This commit is contained in:
parent
d5692c713f
commit
764d261276
@ -1,3 +1,13 @@
|
||||
2014-11-21 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* init.cc (dll_entry): Revert previous patch. This requires another
|
||||
solution.
|
||||
* miscfuncs.cc (thread_wrapper): Ditto.
|
||||
* sigproc.cc (exit_thread): Disable sending a signal for synchronization
|
||||
with process exit. Explain why. Keep code in for later inspection,
|
||||
should the problem show up again.
|
||||
(sig_send): Use "tls", rather than "tid" as name for _cygtls arg.
|
||||
|
||||
2014-11-20 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* init.cc (dll_entry): Call _my_tls.remove with INFINITE wait period
|
||||
|
@ -95,7 +95,7 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
|
||||
if (dll_finished_loading
|
||||
&& (PVOID) &_my_tls > (PVOID) &test_stack_marker
|
||||
&& _my_tls.isinitialized ())
|
||||
_my_tls.remove (INFINITE);
|
||||
_my_tls.remove (0);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -564,7 +564,7 @@ thread_wrapper (PVOID arg)
|
||||
cfree (arg);
|
||||
|
||||
/* Remove _cygtls from this stack since it won't be used anymore. */
|
||||
_my_tls.remove (INFINITE);
|
||||
_my_tls.remove (0);
|
||||
|
||||
/* Set stack values in TEB */
|
||||
PTEB teb = NtCurrentTeb ();
|
||||
|
@ -451,6 +451,14 @@ exit_thread (DWORD res)
|
||||
if (no_thread_exit_protect ())
|
||||
ExitThread (res);
|
||||
sigfillset (&_my_tls.sigmask); /* No signals wanted */
|
||||
|
||||
/* CV 2014-11-21: Disable the code sending a signal. The problem with
|
||||
this code is that it allows deadlocks under signal-rich multithreading
|
||||
conditions.
|
||||
The original problem reported in 2012 couldn't be reproduced anymore,
|
||||
even disabling this code. Tested on XP 32, Vista 32, W7 32, WOW64, 64,
|
||||
W8.1 WOW64, 64. */
|
||||
#if 0
|
||||
lock_process for_now; /* May block indefinitely when exiting. */
|
||||
HANDLE h;
|
||||
if (!DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
|
||||
@ -469,16 +477,17 @@ exit_thread (DWORD res)
|
||||
siginfo_t si = {__SIGTHREADEXIT, SI_KERNEL};
|
||||
si.si_cyg = h;
|
||||
sig_send (myself_nowait, si, &_my_tls);
|
||||
#endif
|
||||
ExitThread (res);
|
||||
}
|
||||
|
||||
int __reg3
|
||||
sig_send (_pinfo *p, int sig, _cygtls *tid)
|
||||
sig_send (_pinfo *p, int sig, _cygtls *tls)
|
||||
{
|
||||
siginfo_t si = {};
|
||||
si.si_signo = sig;
|
||||
si.si_code = SI_KERNEL;
|
||||
return sig_send (p, si, tid);
|
||||
return sig_send (p, si, tls);
|
||||
}
|
||||
|
||||
/* Send a signal to another process by raising its signal semaphore.
|
||||
|
Loading…
x
Reference in New Issue
Block a user