From da9edae1f4adb9d1289a557b5fb99075bfe690d5 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 4 Apr 2011 11:05:21 +0200 Subject: [PATCH] Issue #11753: faulthandler thread uses pthread_sigmask() The thread must not receive any signal. If the thread receives a signal, sem_timedwait() is interrupted and returns EINTR, but in this case, PyThread_acquire_lock_timed() retries sem_timedwait() and the main thread is not aware of the signal. The problem is that some tests expect that the main thread receives the signal, not faulthandler handler, which should be invisible. On Linux, the signal looks to be received by the main thread, whereas on FreeBSD, it can be any thread. --- Modules/faulthandler.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index b300ef1f86..abc12a0ff8 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -399,6 +399,17 @@ faulthandler_thread(void *unused) const char* errmsg; PyThreadState *current; int ok; +#ifdef HAVE_PTHREAD_H + sigset_t set; + + /* we don't want to receive any signal */ + sigfillset(&set); +#if defined(HAVE_PTHREAD_SIGMASK) && !defined(HAVE_BROKEN_PTHREAD_SIGMASK) + pthread_sigmask(SIG_SETMASK, &set, NULL); +#else + sigprocmask(SIG_SETMASK, &set, NULL); +#endif +#endif do { st = PyThread_acquire_lock_timed(thread.cancel_event, -- 2.50.1