* exceptions.cc (sigpacket::process): Reorganize to avoid use of tls before

initialization.
* fhandler_fifo.cc (fhandler_fifo::arm): Avoid improper printing of integer as
a string in debug output.
This commit is contained in:
Christopher Faylor 2012-12-07 20:59:44 +00:00
parent 0d1a50b81a
commit ff8ba3cabe
3 changed files with 25 additions and 13 deletions

View File

@ -1,3 +1,11 @@
2012-12-07 Christopher Faylor <me.cygwin2012@cgf.cx>
* exceptions.cc (sigpacket::process): Reorganize to avoid use of tls
before initialization.
* fhandler_fifo.cc (fhandler_fifo::arm): Avoid improper printing of
integer as a string in debug output.
2012-12-07 Christopher Faylor <me.cygwin2012@cgf.cx>
* sigproc.h (sigpacket): Remove parameter names from declarations.

View File

@ -1123,7 +1123,6 @@ sigpacket::process ()
{
bool continue_now;
struct sigaction dummy = global_sigs[SIGSTOP];
_cygtls *tls;
if (si.si_signo != SIGCONT)
continue_now = false;
@ -1159,20 +1158,11 @@ sigpacket::process ()
myself->rusage_self.ru_nsignals++;
void *handler = (void *) thissig.sa_handler;
if (handler == SIG_IGN)
{
sigproc_printf ("signal %d ignored", si.si_signo);
goto done;
}
if (have_execed)
handler = NULL;
_cygtls *tls;
if (sigtls)
{
tls = sigtls;
sigproc_printf ("using sigtls %p", tls);
sigproc_printf ("using sigtls %p", sigtls);
}
else
{
@ -1180,6 +1170,16 @@ sigpacket::process ()
sigproc_printf ("using tls %p", tls);
}
void *handler = (void *) thissig.sa_handler;
if (have_execed)
handler = NULL;
if (handler == SIG_IGN)
{
sigproc_printf ("signal %d ignored", si.si_signo);
goto done;
}
if (si.si_signo == SIGKILL)
goto exit_sig;
if (si.si_signo == SIGSTOP)

View File

@ -68,7 +68,11 @@ fhandler_fifo::arm (HANDLE h)
bool res = SetEvent (h);
if (!res)
debug_printf ("SetEvent for %s failed, %E", res);
#ifdef DEBUGGING
debug_printf ("SetEvent for %s failed, %E", what);
#else
debug_printf ("SetEvent failed, %E");
#endif
return res;
}