traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #11393: fault handler uses raise(signum) for SIGILL on Windows

This commit is contained in:
Victor Stinner 2011-04-01 12:08:57 +02:00
parent 7098685bdb
commit bc6a4db66d
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Modules/faulthandler.c
View File

@ -270,14 +270,16 @@ faulthandler_fatal_error(
else else
_Py_DumpTraceback(fd, tstate); _Py_DumpTraceback(fd, tstate);
#ifndef MS_WINDOWS #ifdef MS_WINDOWS
/* call the previous signal handler: it is called if we use sigaction() if (signum == SIGSEGV) {
thanks to SA_NODEFER flag, otherwise it is deferred */ /* don't call explictly the previous handler for SIGSEGV in this signal
raise(signum); handler, because the Windows signal handler would not be called */
#else return;
/* on Windows, don't call explictly the previous handler, because Windows }
signal handler would not be called */
#endif #endif
/* call the previous signal handler: it is called immediatly if we use
sigaction() thanks to SA_NODEFER flag, otherwise it is deferred */
raise(signum);
} }
/* Install handler for fatal signals (SIGSEGV, SIGFPE, ...). */ /* Install handler for fatal signals (SIGSEGV, SIGFPE, ...). */
@ -681,8 +683,9 @@ static PyObject *
faulthandler_sigsegv(PyObject *self, PyObject *args) faulthandler_sigsegv(PyObject *self, PyObject *args)
{ {
#if defined(MS_WINDOWS) #if defined(MS_WINDOWS)
/* faulthandler_fatal_error() restores the previous signal handler and then /* For SIGSEGV, faulthandler_fatal_error() restores the previous signal
gives back the execution flow to the program. In a normal case, the handler and then gives back the execution flow to the program (without
calling explicitly the previous error handler). In a normal case, the
SIGSEGV was raised by the kernel because of a fault, and so if the SIGSEGV was raised by the kernel because of a fault, and so if the
program retries to execute the same instruction, the fault will be program retries to execute the same instruction, the fault will be
raised again. raised again.
@ -724,13 +727,7 @@ faulthandler_sigbus(PyObject *self, PyObject *args)
static PyObject * static PyObject *
faulthandler_sigill(PyObject *self, PyObject *args) faulthandler_sigill(PyObject *self, PyObject *args)
{ {
#if defined(MS_WINDOWS)
/* see faulthandler_sigsegv() for the explanation about while(1) */
while(1)
raise(SIGILL); raise(SIGILL);
#else
raise(SIGILL);
#endif
Py_RETURN_NONE; Py_RETURN_NONE;
} }
#endif #endif