[Python-checkins] r42607 - in python/trunk: Misc/NEWS Python/pystate.c
tim.peters
python-checkins at python.org
Mon Feb 27 18:15:36 CET 2006
Author: tim.peters
Date: Mon Feb 27 18:15:31 2006
New Revision: 42607
Modified:
python/trunk/Misc/NEWS
python/trunk/Python/pystate.c
Log:
Patch 1413181, by Gabriel Becedillas.
PyThreadState_Delete(): if the auto-GIL-state machinery knows about
the thread state, forget it (since the thread state is being deleted,
continuing to remember it can't help, but can hurt if another thread
happens to get created with the same thread id).
I'll backport to 2.4 next.
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Mon Feb 27 18:15:31 2006
@@ -230,6 +230,12 @@
unicode instance if the argument is not an instance of basestring and
calling __str__ on the argument returns a unicode instance.
+- Patch #1413181: changed ``PyThreadState_Delete()`` to forget about the
+ current thread state when the auto-GIL-state machinery knows about
+ it (since the thread state is being deleted, continuing to remember it
+ can't help, but can hurt if another thread happens to get created with
+ the same thread id).
+
Extension Modules
-----------------
Modified: python/trunk/Python/pystate.c
==============================================================================
--- python/trunk/Python/pystate.c (original)
+++ python/trunk/Python/pystate.c Mon Feb 27 18:15:31 2006
@@ -262,6 +262,10 @@
if (tstate == _PyThreadState_Current)
Py_FatalError("PyThreadState_Delete: tstate is still current");
tstate_delete_common(tstate);
+#ifdef WITH_THREAD
+ if (autoTLSkey && PyThread_get_key_value(autoTLSkey) == tstate)
+ PyThread_delete_key_value(autoTLSkey);
+#endif /* WITH_THREAD */
}
More information about the Python-checkins
mailing list