summaryrefslogtreecommitdiff
path: root/Python/pystate.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-09-06 00:59:49 +0200
committerAntoine Pitrou <solipsis@pitrou.net>2012-09-06 00:59:49 +0200
commit56cd62c04a7fbd9d923de000e6e6734cf8ac9ddc (patch)
treeed5ce8c8953b5f8f6ed136a94629f631083f2594 /Python/pystate.c
parent1d857453b7065dafdc34a72c1bbb2a993782b383 (diff)
downloadcpython-git-56cd62c04a7fbd9d923de000e6e6734cf8ac9ddc.tar.gz
Issue #13992: The trashcan mechanism is now thread-safe. This eliminates
sporadic crashes in multi-thread programs when several long deallocator chains ran concurrently and involved subclasses of built-in container types. Because of this change, a couple extension modules compiled for 3.2.4 (those which use the trashcan mechanism, despite it being undocumented) will not be loadable by 3.2.3 and earlier. However, extension modules compiled for 3.2.3 and earlier will be loadable by 3.2.4.
Diffstat (limited to 'Python/pystate.c')
-rw-r--r--Python/pystate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Python/pystate.c b/Python/pystate.c
index 13923313c0..42bc3eceaf 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -206,6 +206,9 @@ new_threadstate(PyInterpreterState *interp, int init)
tstate->c_profileobj = NULL;
tstate->c_traceobj = NULL;
+ tstate->trash_delete_nesting = 0;
+ tstate->trash_delete_later = NULL;
+
if (init)
_PyThreadState_Init(tstate);