mirror of
https://github.com/python/cpython
synced 2024-10-08 02:29:43 +00:00
Recorded merge of revisions 75123 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75123 | philip.jenvey | 2009-09-28 21:32:44 -0700 (Mon, 28 Sep 2009) | 4 lines #6990: clear threading.local's key only after its thread state is removed: fixes local subclasses leaving old state around after a ref cycle GC which could be recycled by new locals ........
This commit is contained in:
parent
12c4bdb0e8
commit
26713cade1
|
@ -67,6 +67,45 @@ def f(i):
|
|||
for t in threads:
|
||||
t.join()
|
||||
|
||||
def test_derived_cycle_dealloc(self):
|
||||
# http://bugs.python.org/issue6990
|
||||
class Local(threading.local):
|
||||
pass
|
||||
locals = None
|
||||
passed = False
|
||||
e1 = threading.Event()
|
||||
e2 = threading.Event()
|
||||
|
||||
def f():
|
||||
nonlocal passed
|
||||
# 1) Involve Local in a cycle
|
||||
cycle = [Local()]
|
||||
cycle.append(cycle)
|
||||
cycle[0].foo = 'bar'
|
||||
|
||||
# 2) GC the cycle (triggers threadmodule.c::local_clear
|
||||
# before local_dealloc)
|
||||
del cycle
|
||||
gc.collect()
|
||||
e1.set()
|
||||
e2.wait()
|
||||
|
||||
# 4) New Locals should be empty
|
||||
passed = all(not hasattr(local, 'foo') for local in locals)
|
||||
|
||||
t = threading.Thread(target=f)
|
||||
t.start()
|
||||
e1.wait()
|
||||
|
||||
# 3) New Locals should recycle the original's address. Creating
|
||||
# them in the thread overwrites the thread state and avoids the
|
||||
# bug
|
||||
locals = [Local() for i in range(10)]
|
||||
e2.set()
|
||||
t.join()
|
||||
|
||||
self.assertTrue(passed)
|
||||
|
||||
|
||||
def test_main():
|
||||
suite = unittest.TestSuite()
|
||||
|
|
|
@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #6990: Fix threading.local subclasses leaving old state around
|
||||
after a reference cycle GC which could be recycled by new locals.
|
||||
|
||||
- Issue #5460: Fix an ambiguity in the grammar.
|
||||
|
||||
- Issue #1766304: Improve performance of membership tests on range objects.
|
||||
|
|
|
@ -239,7 +239,6 @@ local_traverse(localobject *self, visitproc visit, void *arg)
|
|||
static int
|
||||
local_clear(localobject *self)
|
||||
{
|
||||
Py_CLEAR(self->key);
|
||||
Py_CLEAR(self->args);
|
||||
Py_CLEAR(self->kw);
|
||||
Py_CLEAR(self->dict);
|
||||
|
@ -261,6 +260,7 @@ local_dealloc(localobject *self)
|
|||
PyDict_DelItem(tstate->dict, self->key);
|
||||
}
|
||||
|
||||
Py_XDECREF(self->key);
|
||||
local_clear(self);
|
||||
Py_TYPE(self)->tp_free((PyObject*)self);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue