mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

remove extra call to tstate_delete_common (merge artifact)

Browse source
This commit is contained in:
Benjamin Peterson 2014-06-16 23:49:02 -07:00
parent 9db281662d
commit 95d75194ac
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/pystate.c
View file

@ -423,6 +423,8 @@ PyThreadState_DeleteCurrent()
Py_FatalError( Py_FatalError(
"PyThreadState_DeleteCurrent: no current tstate"); "PyThreadState_DeleteCurrent: no current tstate");
_Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL);
if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
PyThread_delete_key_value(autoTLSkey);
/* /*
Only call tstate_delete_common to have the tstate if we're not finalizing 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 or we're the main thread. The main thread will do this for us. Not calling
@ -431,9 +433,6 @@ PyThreadState_DeleteCurrent()
*/ */
if (!_Py_Finalizing || _Py_Finalizing == tstate) if (!_Py_Finalizing || _Py_Finalizing == tstate)
tstate_delete_common(tstate); tstate_delete_common(tstate);
if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
PyThread_delete_key_value(autoTLSkey);
tstate_delete_common(tstate);
PyEval_ReleaseLock(); PyEval_ReleaseLock();
} }
#endif /* WITH_THREAD */ #endif /* WITH_THREAD */