Skip to content

Commit 87e78ce

Browse files
author
Victor Stinner
committed
Issue #12469: partial revert of 024827a9db64, freebsd6 thread initialization
* Don't create a thread at startup anymore to initialize the pthread library: it changes the behaviour of many functions related to signal handling like sigwait() * Reenable test_sigtimedwait_poll() on FreeBSD 6
1 parent 8fbfc12 commit 87e78ce

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

Lib/test/test_signal.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,6 @@ def test(signum):
670670

671671
@unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
672672
'need signal.sigtimedwait()')
673-
# issue #12303: sigtimedwait() takes 30 seconds on FreeBSD 6 (kernel bug)
674-
@unittest.skipIf(sys.platform =='freebsd6',
675-
"sigtimedwait() with a null timeout doens't work on FreeBSD 6")
676673
def test_sigtimedwait_poll(self):
677674
# check that polling with sigtimedwait works
678675
self.wait_helper(signal.SIGALRM, '''

Python/thread_pthread.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,7 @@ typedef struct {
144144
* Initialization.
145145
*/
146146

147-
/* On FreeBSD6, pthread_kill() doesn't work on the main thread before
148-
the creation of the first thread */
149-
#if defined(_HAVE_BSDI) \
150-
|| (defined(__FreeBSD__) && __FreeBSD_version < 700000)
147+
#if defined(_HAVE_BSDI)
151148
static
152149
void _noop(void)
153150
{

0 commit comments

Comments
 (0)