diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-17 00:34:46 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-17 00:34:46 -0700 |
| commit | b6ae0e45c14c96457f81c5fcf093c68825000aad (patch) | |
| tree | d0efa8656c3830506cd0ab6fdce082735c3df8be /Python | |
| parent | 7062ebc4a88e245a7690a82095ec923cecdf0fa1 (diff) | |
| download | cpython-b6ae0e45c14c96457f81c5fcf093c68825000aad.tar.gz | |
revert tstate_delete_common, since it's pretty much wrong
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pystate.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 7afca17b7e..2ac2fd5274 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 */ |