diff options
| -rw-r--r-- | Lib/test/test_faulthandler.py | 8 | ||||
| -rw-r--r-- | Modules/faulthandler.c | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index 0d86cb5..12969d5 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -185,6 +185,14 @@ class FaultHandlerTests(unittest.TestCase): 2, 'xyz') + def test_fatal_error_without_gil(self): + self.check_fatal_error(""" + import faulthandler + faulthandler._fatal_error(b'xyz', True) + """, + 2, + 'xyz') + @unittest.skipIf(sys.platform.startswith('openbsd') and HAVE_THREADS, "Issue #12868: sigaltstack() doesn't work on " "OpenBSD if Python is compiled with pthread") diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index 14384b5..45c9fcb 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -935,10 +935,18 @@ static PyObject * faulthandler_fatal_error_py(PyObject *self, PyObject *args) { char *message; - if (!PyArg_ParseTuple(args, "y:fatal_error", &message)) + int release_gil = 0; + if (!PyArg_ParseTuple(args, "y|i:fatal_error", &message, &release_gil)) return NULL; faulthandler_suppress_crash_report(); - Py_FatalError(message); + if (release_gil) { + Py_BEGIN_ALLOW_THREADS + Py_FatalError(message); + Py_END_ALLOW_THREADS + } + else { + Py_FatalError(message); + } Py_RETURN_NONE; } |