Mailman 3 April 2011 - Python-checkins

devguide: Top level sections only in sidebar TOC on FAQ page.
by r.david.murray April 1, 2011

April 1, 2011

http://hg.python.org/devguide/rev/1dc036ca6c94 changeset: 409:1dc036ca6c94 user: R David Murray <rdmurray(a)bitdance.com> date: Fri Apr 01 12:16:53 2011 -0400 summary: Top level sections only in sidebar TOC on FAQ page. files: faq.rst | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -1,3 +1,5 @@ +:tocdepth: 2 + .. _faq: Python Developer FAQ -- Repository URL: http://hg.python.org/devguide

1 0

cpython: Issue #11727: set regrtest default timeout to 15 minutes
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/15f6fe139181 changeset: 69104:15f6fe139181 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 15:59:59 2011 +0200 summary: Issue #11727: set regrtest default timeout to 15 minutes files: Lib/test/regrtest.py | 5 +++-- Misc/NEWS | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -22,7 +22,8 @@ -h/--help -- print this text and exit --timeout TIMEOUT -- dump the traceback and exit if a test takes more - than TIMEOUT seconds + than TIMEOUT seconds (default: 15 minutes); disable + the timeout if TIMEOUT is zero Verbosity @@ -239,7 +240,7 @@ findleaks=False, use_resources=None, trace=False, coverdir='coverage', runleaks=False, huntrleaks=False, verbose2=False, print_slow=False, random_seed=None, use_mp=None, verbose3=False, forever=False, - header=False, timeout=None): + header=False, timeout=15*60): """Execute a test suite. This also parses command-line options and modifies its behavior diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -361,7 +361,9 @@ Tests ----- -- Issue #11727: add --timeout option to regrtest (disabled by default). +- Issue #11727: If a test takes more than 15 minutes, regrtest dumps the + traceback of all threads and exits. Use --timeout option to change the + default timeout or to disable it. - Issue #11653: fix -W with -j in regrtest. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #11393: signal of user signal displays tracebacks even if tstate==NULL
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/e609105dff64 changeset: 69103:e609105dff64 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 15:37:12 2011 +0200 summary: Issue #11393: signal of user signal displays tracebacks even if tstate==NULL * faulthandler_user() displays the tracebacks of all threads even if it is unable to get the state of the current thread * test_faulthandler: only release the GIL in test_gil_released() check * create check_signum() subfunction files: Lib/test/test_faulthandler.py | 9 ++- Modules/faulthandler.c | 58 ++++++++++++++-------- 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -8,6 +8,8 @@ import tempfile import unittest +TIMEOUT = 0.5 + try: from resource import setrlimit, RLIMIT_CORE, error as resource_error except ImportError: @@ -189,7 +191,7 @@ import faulthandler output = open({filename}, 'wb') faulthandler.enable(output) -faulthandler._read_null(True) +faulthandler._read_null() """.strip().format(filename=repr(filename)), 4, '(?:Segmentation fault|Bus error)', @@ -199,7 +201,7 @@ self.check_fatal_error(""" import faulthandler faulthandler.enable(all_threads=True) -faulthandler._read_null(True) +faulthandler._read_null() """.strip(), 3, '(?:Segmentation fault|Bus error)', @@ -376,7 +378,7 @@ # Check that sleep() was not interrupted assert (b - a) >= min_pause, "{{}} < {{}}".format(b - a, min_pause) -timeout = 0.5 +timeout = {timeout} repeat = {repeat} cancel = {cancel} if {has_filename}: @@ -394,6 +396,7 @@ has_filename=bool(filename), repeat=repeat, cancel=cancel, + timeout=TIMEOUT, ) trace, exitcode = self.get_output(code, filename) trace = '\n'.join(trace) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -65,6 +65,7 @@ int fd; int all_threads; _Py_sighandler_t previous; + PyInterpreterState *interp; } user_signal_t; static user_signal_t *user_signals; @@ -529,15 +530,35 @@ the thread doesn't hold the GIL. Read the thread local storage (TLS) instead: call PyGILState_GetThisThreadState(). */ tstate = PyGILState_GetThisThreadState(); - if (tstate == NULL) { - /* unable to get the current thread, do nothing */ - return; - } if (user->all_threads) - _Py_DumpTracebackThreads(user->fd, tstate->interp, tstate); - else + _Py_DumpTracebackThreads(user->fd, user->interp, tstate); + else { + if (tstate == NULL) + return; _Py_DumpTraceback(user->fd, tstate); + } +} + +static int +check_signum(int signum) +{ + unsigned int i; + + for (i=0; i < faulthandler_nsignals; i++) { + if (faulthandler_handlers[i].signum == signum) { + PyErr_Format(PyExc_RuntimeError, + "signal %i cannot be registered, " + "use enable() instead", + signum); + return 0; + } + } + if (signum < 1 || NSIG <= signum) { + PyErr_SetString(PyExc_ValueError, "signal number out of range"); + return 0; + } + return 1; } static PyObject* @@ -549,12 +570,12 @@ PyObject *file = NULL; int all_threads = 0; int fd; - unsigned int i; user_signal_t *user; _Py_sighandler_t previous; #ifdef HAVE_SIGACTION struct sigaction action; #endif + PyThreadState *tstate; int err; if (!PyArg_ParseTupleAndKeywords(args, kwargs, @@ -562,19 +583,15 @@ &signum, &file, &all_threads)) return NULL; - if (signum < 1 || NSIG <= signum) { - PyErr_SetString(PyExc_ValueError, "signal number out of range"); + if (!check_signum(signum)) return NULL; - } - for (i=0; i < faulthandler_nsignals; i++) { - if (faulthandler_handlers[i].signum == signum) { - PyErr_Format(PyExc_RuntimeError, - "signal %i cannot be registered by register(), " - "use enable() instead", - signum); - return NULL; - } + /* The caller holds the GIL and so PyThreadState_Get() can be used */ + 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); @@ -620,6 +637,7 @@ user->fd = fd; user->all_threads = all_threads; user->previous = previous; + user->interp = tstate->interp; user->enabled = 1; Py_RETURN_NONE; @@ -651,10 +669,8 @@ if (!PyArg_ParseTuple(args, "i:unregister", &signum)) return NULL; - if (signum < 1 || NSIG <= signum) { - PyErr_SetString(PyExc_ValueError, "signal number out of range"); + if (!check_signum(signum)) return NULL; - } user = &user_signals[signum]; change = faulthandler_unregister(user, signum); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #11393: _Py_DumpTraceback() writes the header even if there is no frame
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/7e3ed426962f changeset: 69102:7e3ed426962f user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 15:34:01 2011 +0200 summary: Issue #11393: _Py_DumpTraceback() writes the header even if there is no frame files: Include/traceback.h | 4 +--- Python/traceback.c | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Include/traceback.h b/Include/traceback.h --- a/Include/traceback.h +++ b/Include/traceback.h @@ -38,8 +38,6 @@ ... File "xxx", line xxx in <xxx> - Return 0 on success, -1 on error. - This function is written for debug purpose only, to dump the traceback in the worst case: after a segmentation fault, at fatal error, etc. That's why, it is very limited. Strings are truncated to 100 characters and encoded to @@ -49,7 +47,7 @@ This function is signal safe. */ -PyAPI_DATA(int) _Py_DumpTraceback( +PyAPI_DATA(void) _Py_DumpTraceback( int fd, PyThreadState *tstate); diff --git a/Python/traceback.c b/Python/traceback.c --- a/Python/traceback.c +++ b/Python/traceback.c @@ -556,18 +556,19 @@ write(fd, "\n", 1); } -static int +static void dump_traceback(int fd, PyThreadState *tstate, int write_header) { PyFrameObject *frame; unsigned int depth; + if (write_header) + PUTS(fd, "Traceback (most recent call first):\n"); + frame = _PyThreadState_GetFrame(tstate); if (frame == NULL) - return -1; + return; - if (write_header) - PUTS(fd, "Traceback (most recent call first):\n"); depth = 0; while (frame != NULL) { if (MAX_FRAME_DEPTH <= depth) { @@ -580,13 +581,12 @@ frame = frame->f_back; depth++; } - return 0; } -int +void _Py_DumpTraceback(int fd, PyThreadState *tstate) { - return dump_traceback(fd, tstate, 1); + dump_traceback(fd, tstate, 1); } /* Write the thread identifier into the file 'fd': "Current thread 0xHHHH:\" if -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #11393: Fix faulthandler.disable() and add a test
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/a27755b10448 changeset: 69101:a27755b10448 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 12:56:17 2011 +0200 summary: Issue #11393: Fix faulthandler.disable() and add a test files: Lib/test/test_faulthandler.py | 32 +++++++++++++++++----- Modules/faulthandler.c | 8 ++-- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -431,13 +431,15 @@ @unittest.skipIf(not hasattr(faulthandler, "register"), "need faulthandler.register") - def check_register(self, filename=False, all_threads=False): + def check_register(self, filename=False, all_threads=False, + unregister=False): """ Register a handler displaying the traceback on a user signal. Raise the signal and check the written traceback. Raise an error if the output doesn't match the expected format. """ + signum = signal.SIGUSR1 code = """ import faulthandler import os @@ -446,12 +448,15 @@ def func(signum): os.kill(os.getpid(), signum) -signum = signal.SIGUSR1 +signum = {signum} +unregister = {unregister} if {has_filename}: file = open({filename}, "wb") else: file = None faulthandler.register(signum, file=file, all_threads={all_threads}) +if unregister: + faulthandler.unregister(signum) func(signum) if file is not None: file.close() @@ -460,20 +465,31 @@ filename=repr(filename), has_filename=bool(filename), all_threads=all_threads, + signum=signum, + unregister=unregister, ) trace, exitcode = self.get_output(code, filename) trace = '\n'.join(trace) - if all_threads: - regex = 'Current thread XXX:\n' + if not unregister: + if all_threads: + regex = 'Current thread XXX:\n' + else: + regex = 'Traceback \(most recent call first\):\n' + regex = expected_traceback(6, 17, regex) + self.assertRegex(trace, regex) else: - regex = 'Traceback \(most recent call first\):\n' - regex = expected_traceback(6, 14, regex) - self.assertRegex(trace, regex) - self.assertEqual(exitcode, 0) + self.assertEqual(trace, '') + if unregister: + self.assertNotEqual(exitcode, 0) + else: + self.assertEqual(exitcode, 0) def test_register(self): self.check_register() + def test_unregister(self): + self.check_register(unregister=True) + def test_register_file(self): with temporary_filename() as filename: self.check_register(filename=filename) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -628,7 +628,7 @@ static int faulthandler_unregister(user_signal_t *user, int signum) { - if (user->enabled) + if (!user->enabled) return 0; user->enabled = 0; #ifdef HAVE_SIGACTION @@ -976,7 +976,7 @@ void _PyFaulthandler_Fini(void) { #ifdef FAULTHANDLER_USER - unsigned int i; + unsigned int signum; #endif #ifdef FAULTHANDLER_LATER @@ -995,8 +995,8 @@ #ifdef FAULTHANDLER_USER /* user */ if (user_signals != NULL) { - for (i=0; i < NSIG; i++) - faulthandler_unregister(&user_signals[i], i+1); + for (signum=0; signum < NSIG; signum++) + faulthandler_unregister(&user_signals[signum], signum); free(user_signals); user_signals = NULL; } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #11393: The fault handler handles also SIGABRT
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/a4fa79b0d478 changeset: 69100:a4fa79b0d478 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 12:13:55 2011 +0200 summary: Issue #11393: The fault handler handles also SIGABRT files: Doc/library/faulthandler.rst | 14 ++++---- Doc/using/cmdline.rst | 5 ++- Lib/test/test_faulthandler.py | 9 ++++++ Modules/faulthandler.c | 33 +++++++++++++++++----- Python/pythonrun.c | 1 + 5 files changed, 45 insertions(+), 17 deletions(-) diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst --- a/Doc/library/faulthandler.rst +++ b/Doc/library/faulthandler.rst @@ -6,10 +6,10 @@ This module contains functions to dump the Python traceback explicitly, on a fault, after a timeout or on a user signal. Call :func:`faulthandler.enable` to -install fault handlers for :const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGBUS` -and :const:`SIGILL` signals. You can also enable them at startup by setting the -:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X` -``faulthandler`` command line option. +install fault handlers for :const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, +:const:`SIGBUS` and :const:`SIGILL` signals. You can also enable them at +startup by setting the :envvar:`PYTHONFAULTHANDLER` environment variable or by +using :option:`-X` ``faulthandler`` command line option. The fault handler is compatible with system fault handlers like Apport or the Windows fault handler. The module uses an alternative stack for signal @@ -48,9 +48,9 @@ .. function:: enable(file=sys.stderr, all_threads=False) Enable the fault handler: install handlers for :const:`SIGSEGV`, - :const:`SIGFPE`, :const:`SIGBUS` and :const:`SIGILL` signals to dump the - Python traceback. It dumps the traceback of the current thread, or all - threads if *all_threads* is ``True``, into *file*. + :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS` and :const:`SIGILL` + signals to dump the Python traceback. It dumps the traceback of the current + thread, or all threads if *all_threads* is ``True``, into *file*. .. function:: disable() diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -502,8 +502,9 @@ If this environment variable is set, :func:`faulthandler.enable` is called at startup: install a handler for :const:`SIGSEGV`, :const:`SIGFPE`, - :const:`SIGBUS` and :const:`SIGILL` signals to dump the Python traceback. - This is equivalent to :option:`-X` ``faulthandler`` option. + :const:`SIGABRT`, :const:`SIGBUS` and :const:`SIGILL` signals to dump the + Python traceback. This is equivalent to :option:`-X` ``faulthandler`` + option. Debug-mode variables diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -112,6 +112,15 @@ 3, 'Segmentation fault') + def test_sigabrt(self): + self.check_fatal_error(""" +import faulthandler +faulthandler.enable() +faulthandler._sigabrt() +""".strip(), + 3, + 'Aborted') + @unittest.skipIf(sys.platform == 'win32', "SIGFPE cannot be caught on Windows") def test_sigfpe(self): diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -10,9 +10,9 @@ #endif #ifndef MS_WINDOWS - /* register() is useless on Windows, because only SIGSEGV and SIGILL can be - handled by the process, and these signals can only be used with enable(), - not using register() */ + /* register() is useless on Windows, because only SIGSEGV, SIGABRT and + SIGILL can be handled by the process, and these signals can only be used + with enable(), not using register() */ # define FAULTHANDLER_USER #endif @@ -96,6 +96,7 @@ {SIGILL, 0, "Illegal instruction", }, #endif {SIGFPE, 0, "Floating point exception", }, + {SIGABRT, 0, "Aborted", }, /* define SIGSEGV at the end to make it the default choice if searching the handler fails in faulthandler_fatal_error() */ {SIGSEGV, 0, "Segmentation fault", } @@ -202,7 +203,7 @@ } -/* Handler of SIGSEGV, SIGFPE, SIGBUS and SIGILL signals. +/* Handler of SIGSEGV, SIGFPE, SIGABRT, SIGBUS and SIGILL signals. Display the current Python traceback, restore the previous handler and call the previous handler. @@ -253,9 +254,9 @@ PUTS(fd, handler->name); PUTS(fd, "\n\n"); - /* SIGSEGV, SIGFPE, SIGBUS and SIGILL are synchronous signals and so are - delivered to the thread that caused the fault. Get the Python thread - state of the current thread. + /* SIGSEGV, SIGFPE, SIGABRT, SIGBUS and SIGILL are synchronous signals and + so are delivered to the thread that caused the fault. Get the Python + thread state of the current thread. PyThreadState_Get() doesn't give the state of the thread that caused the fault if the thread released the GIL, and so this function cannot be @@ -282,7 +283,7 @@ raise(signum); } -/* Install handler for fatal signals (SIGSEGV, SIGFPE, ...). */ +/* Install the handler for fatal signals, faulthandler_fatal_error(). */ static PyObject* faulthandler_enable(PyObject *self, PyObject *args, PyObject *kwargs) @@ -714,6 +715,20 @@ Py_RETURN_NONE; } +static PyObject * +faulthandler_sigabrt(PyObject *self, PyObject *args) +{ +#if _MSC_VER + /* If Python is compiled in debug mode with Visual Studio, abort() opens + a popup asking the user how to handle the assertion. Use raise(SIGABRT) + instead. */ + raise(SIGABRT); +#else + abort(); +#endif + Py_RETURN_NONE; +} + #ifdef SIGBUS static PyObject * faulthandler_sigbus(PyObject *self, PyObject *args) @@ -847,6 +862,8 @@ "a SIGSEGV or SIGBUS signal depending on the platform")}, {"_sigsegv", faulthandler_sigsegv, METH_VARARGS, PyDoc_STR("_sigsegv(): raise a SIGSEGV signal")}, + {"_sigabrt", faulthandler_sigabrt, METH_VARARGS, + PyDoc_STR("_sigabrt(): raise a SIGABRT signal")}, {"_sigfpe", (PyCFunction)faulthandler_sigfpe, METH_NOARGS, PyDoc_STR("_sigfpe(): raise a SIGFPE signal")}, #ifdef SIGBUS diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -2124,6 +2124,7 @@ fflush(stderr); _Py_DumpTraceback(fd, tstate); } + _PyFaulthandler_Fini(); } #ifdef MS_WINDOWS -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #11393: fault handler uses raise(signum) for SIGILL on Windows
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/e51d8a160a8a changeset: 69099:e51d8a160a8a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 12:08:57 2011 +0200 summary: Issue #11393: fault handler uses raise(signum) for SIGILL on Windows files: Modules/faulthandler.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -270,14 +270,16 @@ else _Py_DumpTraceback(fd, tstate); -#ifndef MS_WINDOWS - /* call the previous signal handler: it is called if we use sigaction() - thanks to SA_NODEFER flag, otherwise it is deferred */ +#ifdef MS_WINDOWS + if (signum == SIGSEGV) { + /* don't call explictly the previous handler for SIGSEGV in this signal + handler, because the Windows signal handler would not be called */ + return; + } +#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); -#else - /* on Windows, don't call explictly the previous handler, because Windows - signal handler would not be called */ -#endif } /* Install handler for fatal signals (SIGSEGV, SIGFPE, ...). */ @@ -681,8 +683,9 @@ faulthandler_sigsegv(PyObject *self, PyObject *args) { #if defined(MS_WINDOWS) - /* faulthandler_fatal_error() restores the previous signal handler and then - gives back the execution flow to the program. In a normal case, the + /* For SIGSEGV, faulthandler_fatal_error() restores the previous signal + 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 program retries to execute the same instruction, the fault will be raised again. @@ -724,13 +727,7 @@ static PyObject * faulthandler_sigill(PyObject *self, PyObject *args) { -#if defined(MS_WINDOWS) - /* see faulthandler_sigsegv() for the explanation about while(1) */ - while(1) - raise(SIGILL); -#else raise(SIGILL); -#endif Py_RETURN_NONE; } #endif -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix markup.
by georg.brandl April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/214d0608fb84 changeset: 69098:214d0608fb84 user: Georg Brandl <georg(a)python.org> date: Fri Apr 01 09:19:57 2011 +0200 summary: Fix markup. files: Doc/library/faulthandler.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst --- a/Doc/library/faulthandler.rst +++ b/Doc/library/faulthandler.rst @@ -69,8 +69,8 @@ Dump the tracebacks of all threads, after a timeout of *timeout* seconds, or each *timeout* seconds if *repeat* is ``True``. If *exit* is True, call - :cfunc:`_exit` with status=1 after dumping the tracebacks to terminate - immediatly the process, which is not safe. For example, :cfunc:`_exit` + :c:func:`_exit` with status=1 after dumping the tracebacks to terminate + immediatly the process, which is not safe. For example, :c:func:`_exit` doesn't flush file buffers. If the function is called twice, the new call replaces previous parameters (resets the timeout). The timer has a sub-second resolution. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (3558eecd84f0): sum=0
by solipsis＠pitrou.net April 1, 2011

April 1, 2011

results for 3558eecd84f0 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogYX7SDN', '-x']

1 0

cpython: Issue #11393: fix usage of locks in faulthandler
by victor.stinner April 1, 2011

April 1, 2011

http://hg.python.org/cpython/rev/3558eecd84f0 changeset: 69097:3558eecd84f0 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Apr 01 03:16:51 2011 +0200 summary: Issue #11393: fix usage of locks in faulthandler * faulthandler_cancel_dump_tracebacks_later() is responsible to set running to zero (so we don't need the volatile keyword anymore) * release locks if PyThread_start_new_thread() fails assert(thread.running == 0) was wrong in a corner case files: Modules/faulthandler.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -48,7 +48,7 @@ int fd; PY_TIMEOUT_T timeout_ms; /* timeout in microseconds */ int repeat; - volatile int running; + int running; PyInterpreterState *interp; int exit; /* released by parent thread when cancel request */ @@ -419,7 +419,6 @@ /* The only way out */ PyThread_release_lock(thread.cancel_event); PyThread_release_lock(thread.join_event); - thread.running = 0; } static void @@ -431,8 +430,8 @@ } /* Wait for thread to join */ PyThread_acquire_lock(thread.join_event, 1); - assert(thread.running == 0); PyThread_release_lock(thread.join_event); + thread.running = 0; Py_CLEAR(thread.file); } @@ -486,6 +485,8 @@ thread.running = 1; if (PyThread_start_new_thread(faulthandler_thread, NULL) == -1) { thread.running = 0; + PyThread_release_lock(thread.join_event); + PyThread_release_lock(thread.cancel_event); Py_CLEAR(thread.file); PyErr_SetString(PyExc_RuntimeError, "unable to start watchdog thread"); -- Repository URL: http://hg.python.org/cpython

1 0