mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

revert tstate_delete_common, since it's pretty much wrong

Browse source
This commit is contained in:
Benjamin Peterson 2014-06-17 00:34:46 -07:00
parent 95d75194ac
commit 59830b6ec4
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/pystate.c
View file

@ -425,13 +425,6 @@ PyThreadState_DeleteCurrent()
_Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL);
if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
PyThread_delete_key_value(autoTLSkey); PyThread_delete_key_value(autoTLSkey);
/*
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); tstate_delete_common(tstate);
PyEval_ReleaseLock(); PyEval_ReleaseLock();
} }