From e71db4450cc3ede22dbfda7c7eb9149cf685650f Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 24 Jun 2011 20:52:27 +0200
Subject: [PATCH] Issue #12392: fix thread initialization on FreeBSD 6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On FreeBSD6, pthread_kill() doesn't work on the main thread before the creation
of the first thread. Create therefore a dummy thread (no-op) a startup to
initialize the pthread library.

Add also a test for this use case, test written by Charles-François Natali.
---
 Lib/test/test_signal.py | 25 +++++++++++++++++++++++++
 Python/thread_pthread.h |  5 ++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 8a5a4083a07..f23031668d6 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -295,6 +295,31 @@ class WakeupSignalTests(unittest.TestCase):
 
         self.check_signum(signum1, signum2)
 
+    @unittest.skipUnless(hasattr(signal, 'pthread_kill'),
+                         'need signal.pthread_kill()')
+    def test_pthread_kill_main_thread(self):
+        # Test that a signal can be sent to the main thread with pthread_kill()
+        # before any other thread has been created (see issue #12392).
+        code = """if True:
+            import threading
+            import signal
+            import sys
+
+            def handler(signum, frame):
+                sys.exit(3)
+
+            signal.signal(signal.SIGUSR1, handler)
+            signal.pthread_kill(threading.get_ident(), signal.SIGUSR1)
+            sys.exit(1)
+        """
+
+        with spawn_python('-c', code) as process:
+            stdout, stderr = process.communicate()
+            exitcode = process.wait()
+            if exitcode != 3:
+                raise Exception("Child error (exit code %s): %s" %
+                                (exitcode, stdout))
+
     def setUp(self):
         import fcntl
 
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index 09a0887bd45..fe9dde6f521 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -144,7 +144,10 @@ typedef struct {
  * Initialization.
  */
 
-#ifdef _HAVE_BSDI
+/* 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)
 static
 void _noop(void)
 {