Merged revisions 78527,78550 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78527 | gregory.p.smith | 2010-02-28 17:22:39 -0800 (Sun, 28 Feb 2010) | 4 lines

  Issue #7242: On Solaris 9 and earlier calling os.fork() from within a
  thread could raise an incorrect RuntimeError about not holding the import
  lock.  The import lock is now reinitialized after fork.
........
  r78550 | gregory.p.smith | 2010-02-28 22:01:02 -0800 (Sun, 28 Feb 2010) | 2 lines

  Fix test to be skipped on windows.
........

diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 70d89fe41d61972e67e52f5da5727c86c1538141..2601c366d1f6a0574f6182e8d103d9582a2820fa 100644 (file)
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -4,6 +4,7 @@ import random
 from test import support
 import _thread as thread
 import time
+import sys
 import weakref
 
 from test import lock_tests
@@ -193,8 +194,47 @@ class LockTests(lock_tests.LockTests):
     locktype = thread.allocate_lock
 
 
+class TestForkInThread(unittest.TestCase):
+    def setUp(self):
+        self.read_fd, self.write_fd = os.pipe()
+
+    @unittest.skipIf(sys.platform.startswith('win'),
+                    "This test is only appropriate for POSIX-like systems.")
+    def test_forkinthread(self):
+        def thread1():
+            try:
+                pid = os.fork() # fork in a thread
+            except RuntimeError:
+                os._exit(1) # exit the child
+
+            if pid == 0: # child
+                try:
+                    os.close(self.read_fd)
+                    os.write(self.write_fd, b"OK")
+                finally:
+                    os._exit(0)
+            else: # parent
+                os.close(self.write_fd)
+
+        thread.start_new_thread(thread1, ())
+        self.assertEqual(os.read(self.read_fd, 2), b"OK",
+                         "Unable to fork() in thread")
+
+    def tearDown(self):
+        try:
+            os.close(self.read_fd)
+        except OSError:
+            pass
+
+        try:
+            os.close(self.write_fd)
+        except OSError:
+            pass
+
+
 def test_main():
-    support.run_unittest(ThreadRunningTests, BarrierTest, LockTests)
+    support.run_unittest(ThreadRunningTests, BarrierTest, LockTests,
+                         TestForkInThread)
 
 if __name__ == "__main__":
     test_main()

diff --git a/Misc/NEWS b/Misc/NEWS
index fda73e3bc8e7aa36453c089c0044085e0158f08c..0ae3867a5867490baa143988ccebbab96e6aba68 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -751,6 +751,10 @@ Extension Modules
 - Expat: Fix DoS via XML document with malformed UTF-8 sequences
   (CVE_2009_3560).
 
+- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a
+  thread could raise an incorrect RuntimeError about not holding the import
+  lock.  The import lock is now reinitialized after fork.
+
 - Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1
   parameter on some platforms such as OS X.
 

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 8e3f4c0d83f20b2903300e721b66963676e71209..202fae53690c17bf8d52423cafdc3cfc0052248e 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3723,14 +3723,18 @@ static PyObject *
 posix_fork1(PyObject *self, PyObject *noargs)
 {
        pid_t pid;
-       int result;
+       int result = 0;
        _PyImport_AcquireLock();
        pid = fork1();
-       result = _PyImport_ReleaseLock();
+       if (pid == 0) {
+               /* child: this clobbers and resets the import lock. */
+               PyOS_AfterFork();
+       } else {
+               /* parent: release the import lock. */
+               result = _PyImport_ReleaseLock();
+       }
        if (pid == -1)
                return posix_error();
-       if (pid == 0)
-               PyOS_AfterFork();
        if (result < 0) {
                /* Don't clobber the OSError if the fork failed. */
                PyErr_SetString(PyExc_RuntimeError,
@@ -3752,14 +3756,18 @@ static PyObject *
 posix_fork(PyObject *self, PyObject *noargs)
 {
        pid_t pid;
-       int result;
+       int result = 0;
        _PyImport_AcquireLock();
        pid = fork();
-       result = _PyImport_ReleaseLock();
+       if (pid == 0) {
+               /* child: this clobbers and resets the import lock. */
+               PyOS_AfterFork();
+       } else {
+               /* parent: release the import lock. */
+               result = _PyImport_ReleaseLock();
+       }
        if (pid == -1)
                return posix_error();
-       if (pid == 0)
-               PyOS_AfterFork();
        if (result < 0) {
                /* Don't clobber the OSError if the fork failed. */
                PyErr_SetString(PyExc_RuntimeError,
@@ -3877,11 +3885,12 @@ posix_forkpty(PyObject *self, PyObject *noargs)
 
        _PyImport_AcquireLock();
        pid = forkpty(&master_fd, NULL, NULL, NULL);
+       if (pid == 0)
+               PyOS_AfterFork();
+
        result = _PyImport_ReleaseLock();
        if (pid == -1)
                return posix_error();
-       if (pid == 0)
-               PyOS_AfterFork();
        if (result < 0) {
                /* Don't clobber the OSError if the fork failed. */
                PyErr_SetString(PyExc_RuntimeError,

diff --git a/Python/import.c b/Python/import.c
index 2640cdbf579a37adb3f45352e849fb911673e804..4785bca8819b4e3a082d09efea793df11ab166c1 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -295,14 +295,18 @@ _PyImport_ReleaseLock(void)
        return 1;
 }
 
-/* This function used to be called from PyOS_AfterFork to ensure that newly
-   created child processes do not share locks with the parent, but for some
-   reason only on AIX systems. Instead of re-initializing the lock, we now
-   acquire the import lock around fork() calls. */
+/* This function is called from PyOS_AfterFork to ensure that newly
+   created child processes do not share locks with the parent.
+   We now acquire the import lock around fork() calls but on some platforms
+   (Solaris 9 and earlier? see isue7242) that still left us with problems. */
 
 void
 _PyImport_ReInitLock(void)
 {
+       if (import_lock != NULL)
+               import_lock = PyThread_allocate_lock();
+       import_lock_thread = -1;
+       import_lock_level = 0;
 }
 
 #endif