#Issue3088 in-progress: Race condition with instances of classes derived from threadi...

When a thread touches such an object for the first time, a new thread-local __dict__ is created,
and the __init__ method is run.
But a thread switch can occur here; if the other thread touches the same object, it installs another
__dict__; when the first thread resumes, it updates the dictionary of the second...

This is the deep cause of the failures in test_multiprocessing involving "managers" objects.

Backport of r64601.

diff --git a/Lib/test/test_threading_local.py b/Lib/test/test_threading_local.py
index 56fbeddcc4491e91cf727733ec98ef506a329ed8..a7def9530adcbf9f90405d01990976474707b75a 100644 (file)
--- a/Lib/test/test_threading_local.py
+++ b/Lib/test/test_threading_local.py
@@ -2,6 +2,34 @@ import unittest
 from doctest import DocTestSuite
 from test import test_support
 
+class ThreadingLocalTest(unittest.TestCase):
+    def test_derived(self):
+        # Issue 3088: if there is a threads switch inside the __init__
+        # of a threading.local derived class, the per-thread dictionary
+        # is created but not correctly set on the object.
+        # The first member set may be bogus.
+        import threading
+        import time
+        class Local(threading.local):
+            def __init__(self):
+                time.sleep(0.01)
+        local = Local()
+
+        def f(i):
+            local.x = i
+            # Simply check that the variable is correctly set
+            self.assertEqual(local.x, i)
+
+        threads= []
+        for i in range(10):
+            t = threading.Thread(target=f, args=(i,))
+            t.start()
+            threads.append(t)
+
+        for t in threads:
+            t.join()
+
+
 def test_main():
     suite = DocTestSuite('_threading_local')
 
@@ -19,6 +47,7 @@ def test_main():
         suite.addTest(DocTestSuite('_threading_local',
                                    setUp=setUp, tearDown=tearDown)
                       )
+        suite.addTest(unittest.makeSuite(ThreadingLocalTest))
 
     test_support.run_suite(suite)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 4d6dd8344bc2dd26cfb6560b71f69612ea947085..ebaefd48c43ebbf1e6059a68318fd99bb8fce377 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,10 @@ Core and builtins
   set to a custom object whose write() method happens to install
   another file in sys.stdout.
 
+- Issue #3088: Corrected a race condition in classes derived from
+  threading.local: the first member set by a thread could be saved in
+  another thread's dictionary.
+
 - Issue #3100: Corrected a crash on deallocation of a subclassed weakref which
   holds the last (strong) reference to its referent.
 

diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 036619a8fbd08e473c65092230dab6574d9b8794..272604500e49eb357c67952f5e30a0a5139b4711 100644 (file)
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -294,7 +294,10 @@ _ldict(localobject *self)
                }
                
        }
-       else if (self->dict != ldict) {
+
+       /* The call to tp_init above may have caused another thread to run.
+          Install our ldict again. */
+       if (self->dict != ldict) {
                Py_CLEAR(self->dict);
                Py_INCREF(ldict);
                self->dict = ldict;