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

Issue #11393: Fix faulthandler.disable() and add a test

Browse source
This commit is contained in:
Victor Stinner 2011-04-01 12:56:17 +02:00
parent d727e23243
commit a01ca12a52
2 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_faulthandler.py
View file

@ -431,13 +431,15 @@ if file is not None:
@unittest.skipIf(not hasattr(faulthandler, "register"), @unittest.skipIf(not hasattr(faulthandler, "register"),
"need 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 Register a handler displaying the traceback on a user signal. Raise the
signal and check the written traceback. signal and check the written traceback.
Raise an error if the output doesn't match the expected format. Raise an error if the output doesn't match the expected format.
""" """
signum = signal.SIGUSR1
code = """ code = """
import faulthandler import faulthandler
import os import os
@ -446,12 +448,15 @@ import signal
def func(signum): def func(signum):
os.kill(os.getpid(), signum) os.kill(os.getpid(), signum)
signum = signal.SIGUSR1 signum = {signum}
unregister = {unregister}
if {has_filename}: if {has_filename}:
file = open({filename}, "wb") file = open({filename}, "wb")
else: else:
file = None file = None
faulthandler.register(signum, file=file, all_threads={all_threads}) faulthandler.register(signum, file=file, all_threads={all_threads})
if unregister:
faulthandler.unregister(signum)
func(signum) func(signum)
if file is not None: if file is not None:
file.close() file.close()
@ -460,20 +465,31 @@ if file is not None:
filename=repr(filename), filename=repr(filename),
has_filename=bool(filename), has_filename=bool(filename),
all_threads=all_threads, all_threads=all_threads,
signum=signum,
unregister=unregister,
) )
trace, exitcode = self.get_output(code, filename) trace, exitcode = self.get_output(code, filename)
trace = '\n'.join(trace) trace = '\n'.join(trace)
if not unregister:
if all_threads: if all_threads:
regex = 'Current thread XXX:\n' regex = 'Current thread XXX:\n'
else: else:
regex = 'Traceback \(most recent call first\):\n' regex = 'Traceback \(most recent call first\):\n'
regex = expected_traceback(6, 14, regex) regex = expected_traceback(6, 17, regex)
self.assertRegex(trace, regex) self.assertRegex(trace, regex)
else:
self.assertEqual(trace, '')
if unregister:
self.assertNotEqual(exitcode, 0)
else:
self.assertEqual(exitcode, 0) self.assertEqual(exitcode, 0)
def test_register(self): def test_register(self):
self.check_register() self.check_register()
def test_unregister(self):
self.check_register(unregister=True)
def test_register_file(self): def test_register_file(self):
with temporary_filename() as filename: with temporary_filename() as filename:
self.check_register(filename=filename) self.check_register(filename=filename)

8
Modules/faulthandler.c
View file

@ -628,7 +628,7 @@ faulthandler_register(PyObject *self,
static int static int
faulthandler_unregister(user_signal_t *user, int signum) faulthandler_unregister(user_signal_t *user, int signum)
{ {
if (user->enabled) if (!user->enabled)
return 0; return 0;
user->enabled = 0; user->enabled = 0;
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
@ -976,7 +976,7 @@ int _PyFaulthandler_Init(void)
void _PyFaulthandler_Fini(void) void _PyFaulthandler_Fini(void)
{ {
#ifdef FAULTHANDLER_USER #ifdef FAULTHANDLER_USER
unsigned int i; unsigned int signum;
#endif #endif
#ifdef FAULTHANDLER_LATER #ifdef FAULTHANDLER_LATER
@ -995,8 +995,8 @@ void _PyFaulthandler_Fini(void)
#ifdef FAULTHANDLER_USER #ifdef FAULTHANDLER_USER
/* user */ /* user */
if (user_signals != NULL) { if (user_signals != NULL) {
for (i=0; i < NSIG; i++) for (signum=0; signum < NSIG; signum++)
faulthandler_unregister(&user_signals[i], i+1); faulthandler_unregister(&user_signals[signum], signum);
free(user_signals); free(user_signals);
user_signals = NULL; user_signals = NULL;
} }