mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 03:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

faulthandler: check PyThreadState_Get() result in dump_tracebacks_later()

Browse source 
Cleanup also the code
This commit is contained in:
Victor Stinner 2011-04-07 11:37:19 +02:00
parent 0df80926c9
commit 9699440b57
1 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Modules/faulthandler.c
View file

@ -5,6 +5,9 @@
#include <frameobject.h> #include <frameobject.h>
#include <signal.h> #include <signal.h>
/* Allocate at maximum 100 MB of the stack to raise the stack overflow */
#define STACK_OVERFLOW_MAX_SIZE (100*1024*1024)
#ifdef WITH_THREAD #ifdef WITH_THREAD
# define FAULTHANDLER_LATER # define FAULTHANDLER_LATER
#endif #endif
@ -16,9 +19,6 @@
# define FAULTHANDLER_USER # define FAULTHANDLER_USER
#endif #endif
/* Allocate at maximum 100 MB of the stack to raise the stack overflow */
#define STACK_OVERFLOW_MAX_SIZE (100*1024*1024)
#define PUTS(fd, str) write(fd, str, strlen(str)) #define PUTS(fd, str) write(fd, str, strlen(str))
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
@ -451,8 +451,8 @@ faulthandler_cancel_dump_tracebacks_later(void)
} }
static PyObject* static PyObject*
faulthandler_dump_traceback_later(PyObject *self, faulthandler_dump_tracebacks_later(PyObject *self,
PyObject *args, PyObject *kwargs) PyObject *args, PyObject *kwargs)
{ {
static char *kwlist[] = {"timeout", "repeat", "file", "exit", NULL}; static char *kwlist[] = {"timeout", "repeat", "file", "exit", NULL};
double timeout; double timeout;
@ -461,6 +461,7 @@ faulthandler_dump_traceback_later(PyObject *self,
PyObject *file = NULL; PyObject *file = NULL;
int fd; int fd;
int exit = 0; int exit = 0;
PyThreadState *tstate;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"d|iOi:dump_tracebacks_later", kwlist, "d|iOi:dump_tracebacks_later", kwlist,
@ -477,6 +478,13 @@ faulthandler_dump_traceback_later(PyObject *self,
return NULL; return NULL;
} }
tstate = PyThreadState_Get();
if (tstate == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"unable to get the current thread state");
return NULL;
}
file = faulthandler_get_fileno(file, &fd); file = faulthandler_get_fileno(file, &fd);
if (file == NULL) if (file == NULL)
return NULL; return NULL;
@ -490,7 +498,7 @@ faulthandler_dump_traceback_later(PyObject *self,
thread.fd = fd; thread.fd = fd;
thread.timeout_ms = timeout_ms; thread.timeout_ms = timeout_ms;
thread.repeat = repeat; thread.repeat = repeat;
thread.interp = PyThreadState_Get()->interp; thread.interp = tstate->interp;
thread.exit = exit; thread.exit = exit;
/* Arm these locks to serve as events when released */ /* Arm these locks to serve as events when released */
@ -826,7 +834,7 @@ static int
faulthandler_traverse(PyObject *module, visitproc visit, void *arg) faulthandler_traverse(PyObject *module, visitproc visit, void *arg)
{ {
#ifdef FAULTHANDLER_USER #ifdef FAULTHANDLER_USER
unsigned int index; unsigned int signum;
#endif #endif
#ifdef FAULTHANDLER_LATER #ifdef FAULTHANDLER_LATER
@ -834,8 +842,8 @@ faulthandler_traverse(PyObject *module, visitproc visit, void *arg)
#endif #endif
#ifdef FAULTHANDLER_USER #ifdef FAULTHANDLER_USER
if (user_signals != NULL) { if (user_signals != NULL) {
for (index=0; index < NSIG; index++) for (signum=0; signum < NSIG; signum++)
Py_VISIT(user_signals[index].file); Py_VISIT(user_signals[signum].file);
} }
#endif #endif
Py_VISIT(fatal_error.file); Py_VISIT(fatal_error.file);
@ -861,10 +869,11 @@ static PyMethodDef module_methods[] = {
"if all_threads is True, into file")}, "if all_threads is True, into file")},
#ifdef FAULTHANDLER_LATER #ifdef FAULTHANDLER_LATER
{"dump_tracebacks_later", {"dump_tracebacks_later",
(PyCFunction)faulthandler_dump_traceback_later, METH_VARARGS|METH_KEYWORDS, (PyCFunction)faulthandler_dump_tracebacks_later, METH_VARARGS|METH_KEYWORDS,
PyDoc_STR("dump_tracebacks_later(timeout, repeat=False, file=sys.stderr):\n" PyDoc_STR("dump_tracebacks_later(timeout, repeat=False, file=sys.stderrn, exit=False):\n"
"dump the traceback of all threads in timeout seconds,\n" "dump the traceback of all threads in timeout seconds,\n"
"or each timeout seconds if repeat is True.")}, "or each timeout seconds if repeat is True. If exit is True, "
"call _exit(1) which is not safe.")},
{"cancel_dump_tracebacks_later", {"cancel_dump_tracebacks_later",
(PyCFunction)faulthandler_cancel_dump_tracebacks_later_py, METH_NOARGS, (PyCFunction)faulthandler_cancel_dump_tracebacks_later_py, METH_NOARGS,
PyDoc_STR("cancel_dump_tracebacks_later():\ncancel the previous call " PyDoc_STR("cancel_dump_tracebacks_later():\ncancel the previous call "