diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-30 22:42:40 +0000 |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-30 22:42:40 +0000 |
| commit | b615417a836bda336ec4259cebcea77ea4c98762 (patch) | |
| tree | 33a66fa7272444ae8c1d5092dbf2930695d77089 /Modules | |
| parent | 1bdf0d342d60ff5c408916a29101527038690ce8 (diff) | |
| download | cpython-b615417a836bda336ec4259cebcea77ea4c98762.tar.gz | |
#Issue3088 in-progress: Race condition with instances of classes derived from threading.local:
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.
Also a 2.5 backport candidate.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/threadmodule.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c index 81bf288204..a87ddb344d 100644 --- a/Modules/threadmodule.c +++ b/Modules/threadmodule.c @@ -293,7 +293,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; |