diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-30 22:42:40 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-30 22:42:40 (GMT) |
| commit | 1f40c8a8d70ea8789c3ffca126e0d3cce41d0f7d (patch) | |
| tree | 8b1b7ed99094bd380b8eb725efd8132778e05d91 /Modules/threadmodule.c | |
| parent | 1d2ce4568900f4e48ea7bcd86443f346f1e01a53 (diff) | |
| download | cpython-1f40c8a8d70ea8789c3ffca126e0d3cce41d0f7d.zip cpython-1f40c8a8d70ea8789c3ffca126e0d3cce41d0f7d.tar.gz cpython-1f40c8a8d70ea8789c3ffca126e0d3cce41d0f7d.tar.bz2 | |
#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/threadmodule.c')
| -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 81bf288..a87ddb3 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; |