drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* cygheap.cc (init_cygheap::find_tls): Don't consider unitialized threads. 

* cygtls.cc (_cygtls::operator HANDLE): Return NULL when tid is not set.
* exceptions.cc (setup_handler): Don't try to suspend a thread if it has no
handle.
This commit is contained in:
Christopher Faylor 2012-08-16 17:11:41 +00:00
parent 4e754267ed
commit d01efdbe6e
4 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2012-08-16 Christopher Faylor <me.cygwin2012@cgf.cx>
* cygheap.cc (init_cygheap::find_tls): Don't consider unitialized
threads.
* cygtls.cc (_cygtls::operator HANDLE): Return NULL when tid is not
set.
* exceptions.cc (setup_handler): Don't try to suspend a thread if it
has no handle.
2012-08-15 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-08-15 Christopher Faylor <me.cygwin2012@cgf.cx>
Rename cancelable_wait -> cygwait throughout. Rename cancelable_wait -> cygwait throughout.

6
winsup/cygwin/cygheap.cc
View File

@ -628,14 +628,16 @@ init_cygheap::find_tls (int sig)
{ {
threadlist_ix = -1; threadlist_ix = -1;
while (++threadlist_ix < (int) nthreads) while (++threadlist_ix < (int) nthreads)
if (sigismember (&(threadlist[threadlist_ix]->sigwait_mask), sig)) if (threadlist[threadlist_ix]->tid
&& sigismember (&(threadlist[threadlist_ix]->sigwait_mask), sig))
{ {
t = cygheap->threadlist[threadlist_ix]; t = cygheap->threadlist[threadlist_ix];
goto out; goto out;
} }
threadlist_ix = -1; threadlist_ix = -1;
while (++threadlist_ix < (int) nthreads) while (++threadlist_ix < (int) nthreads)
if (!sigismember (&(threadlist[threadlist_ix]->sigmask), sig)) if (threadlist[threadlist_ix]->tid
&& !sigismember (&(threadlist[threadlist_ix]->sigmask), sig))
{ {
t = cygheap->threadlist[threadlist_ix]; t = cygheap->threadlist[threadlist_ix];
break; break;

2
winsup/cygwin/cygtls.h
View File

@ -226,7 +226,7 @@ public:
void signal_debugger (int) __attribute__ ((regparm(2))); void signal_debugger (int) __attribute__ ((regparm(2)));
#ifdef CYGTLS_HANDLE #ifdef CYGTLS_HANDLE
operator HANDLE () const {return tid->win32_obj_id;} operator HANDLE () const {return tid ? NULL : tid->win32_obj_id;}
#endif #endif
void set_siginfo (struct sigpacket *) __attribute__ ((regparm (3))); void set_siginfo (struct sigpacket *) __attribute__ ((regparm (3)));
int call_signal_handler () __attribute__ ((regparm (1))); int call_signal_handler () __attribute__ ((regparm (1)));

6
winsup/cygwin/exceptions.cc
View File

@ -846,7 +846,10 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
DWORD res; DWORD res;
HANDLE hth = (HANDLE) *tls; HANDLE hth = (HANDLE) *tls;
if (!hth)
sigproc_printf ("thread handle NULL, not set up yet?");
else
{
/* Suspend the thread which will receive the signal. /* Suspend the thread which will receive the signal.
If one of these conditions is not true we loop. If one of these conditions is not true we loop.
If the thread is already suspended (which can occur when a program If the thread is already suspended (which can occur when a program
@ -870,6 +873,7 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
ResumeThread (hth); ResumeThread (hth);
if (interrupted) if (interrupted)
goto out; goto out;
}
sigproc_printf ("couldn't interrupt. trying again."); sigproc_printf ("couldn't interrupt. trying again.");
yield (); yield ();