From 59830b6ec4e07394e2ecfccb8683add64b4139d7 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 17 Jun 2014 00:34:46 -0700 Subject: revert tstate_delete_common, since it's pretty much wrong --- Python/pystate.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Python/pystate.c b/Python/pystate.c index 7afca17..2ac2fd5 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -425,14 +425,7 @@ PyThreadState_DeleteCurrent() _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 - 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(); } #endif /* WITH_THREAD */ -- cgit v0.12