[Python-checkins] cpython (2.7): revert tstate_delete_common, since it's pretty much wrong
benjamin.peterson
python-checkins at python.org
Tue Jun 17 09:35:10 CEST 2014
http://hg.python.org/cpython/rev/b97557699db3
changeset: 91242:b97557699db3
branch: 2.7
parent: 91233:58c638e86e30
user: Benjamin Peterson <benjamin at python.org>
date: Tue Jun 17 00:34:14 2014 -0700
summary:
revert tstate_delete_common, since it's pretty much wrong
files:
Python/pystate.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -315,16 +315,9 @@
Py_FatalError(
"PyThreadState_DeleteCurrent: no current tstate");
_PyThreadState_Current = NULL;
- /*
- Only call tstate_delete_common to have the tstate if we're not finalizing
- or we're the main thread. The main thread will do this for us. Not calling
- tstate_delete_common means we won't lock the interpreter head lock,
- avoiding a possible deadlock with the GIL.
- */
- if (!_Py_Finalizing || _Py_Finalizing == tstate)
- tstate_delete_common(tstate);
if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
PyThread_delete_key_value(autoTLSkey);
+ tstate_delete_common(tstate);
PyEval_ReleaseLock();
}
#endif /* WITH_THREAD */
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list