mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Merged revisions 64601 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64601 | amaury.forgeotdarc | 2008-06-30 17:42:40 -0500 (Mon, 30 Jun 2008) | 11 lines #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. ........
This commit is contained in:
parent
ec19d95f51
commit
8a250aeb21
2 changed files with 30 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue