diff options
| author |   Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 22:53:49 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-04 22:53:49 +0200 |
| commit | 87e78ce1c65c299e5eeb07815a6b6e54a64aa673 (patch) | |
| tree | 5636b01a03a6081a5ba91f66f92240aa27e5076e | |
| parent | merge from 3.2 (diff) | |
| download | cpython-87e78ce1c65c299e5eeb07815a6b6e54a64aa673.tar.gz cpython-87e78ce1c65c299e5eeb07815a6b6e54a64aa673.tar.bz2 cpython-87e78ce1c65c299e5eeb07815a6b6e54a64aa673.zip | |
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
| -rw-r--r-- | Lib/test/test_signal.py | 3 | ||||
| -rw-r--r-- | Python/thread_pthread.h | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index ebdd3bcd76b..1d02141b40f 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 fe9dde6f521..4b61e189413 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) { |