From f44ce8748d4dcae7a359b147e5944acb4ed94638 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 3 May 2011 17:20:31 +0200 Subject: Issue #8407: disable faulthandler timeout thread on all platforms The problem is not specific to Mac OS X. --- Lib/test/test_signal.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 1a28ced..0a43fa7 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -494,6 +494,7 @@ class PthreadSigmaskTests(unittest.TestCase): self.assertRaises(RuntimeError, signal.pthread_sigmask, 1700, []) def test_block_unlock(self): + import faulthandler pid = os.getpid() signum = signal.SIGUSR1 @@ -503,20 +504,18 @@ class PthreadSigmaskTests(unittest.TestCase): def read_sigmask(): return signal.pthread_sigmask(signal.SIG_BLOCK, []) - if sys.platform == "darwin": - import faulthandler - # The fault handler timeout thread masks all signals. If the main - # thread masks also SIGUSR1, all threads mask this signal. In this - # case, on Mac OS X, if we send SIGUSR1 to the process, the signal - # is pending in the main or the faulthandler timeout thread. - # Unblock SIGUSR1 in the main thread calls the signal handler only - # if the signal is pending for the main thread. - # - # Stop the faulthandler timeout thread to workaround this problem. - # Another solution would be to send the signal directly to the main - # thread using pthread_kill(), but Python doesn't expose this - # function. - faulthandler.cancel_dump_tracebacks_later() + # The fault handler timeout thread masks all signals. If the main + # thread masks also SIGUSR1, all threads mask this signal. In this + # case, if we send SIGUSR1 to the process, the signal is pending in the + # main or the faulthandler timeout thread. Unblock SIGUSR1 in the main + # thread calls the signal handler only if the signal is pending for the + # main thread. + # + # Stop the faulthandler timeout thread to workaround this problem. + # Another solution would be to send the signal directly to the main + # thread using pthread_kill(), but Python doesn't expose this + # function. + faulthandler.cancel_dump_tracebacks_later() # Install our signal handler old_handler = signal.signal(signum, handler) -- cgit v0.12