From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 4 Jul 2011 20:53:49 +0000 (+0200)
Subject: Issue #12469: partial revert of 024827a9db64, freebsd6 thread initialization
X-Git-Tag: v3.3.0a1~1953
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87e78ce1c65c299e5eeb07815a6b6e54a64aa673;p=python

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
---

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index ebdd3bcd76..1d02141b40 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -670,9 +670,6 @@ class PendingSignalsTests(unittest.TestCase):
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
                          'need signal.sigtimedwait()')
-    # issue #12303: sigtimedwait() takes 30 seconds on FreeBSD 6 (kernel bug)
-    @unittest.skipIf(sys.platform =='freebsd6',
-        "sigtimedwait() with a null timeout doens't work on FreeBSD 6")
     def test_sigtimedwait_poll(self):
         # check that polling with sigtimedwait works
         self.wait_helper(signal.SIGALRM, '''
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index fe9dde6f52..4b61e18941 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -144,10 +144,7 @@ typedef struct {
  * Initialization.
  */
 
-/* On FreeBSD6, pthread_kill() doesn't work on the main thread before
-   the creation of the first thread */
-#if defined(_HAVE_BSDI) \
-    || (defined(__FreeBSD__) && __FreeBSD_version < 700000)
+#if defined(_HAVE_BSDI)
 static
 void _noop(void)
 {