diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-17 07:34:46 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-17 07:34:46 (GMT) |
| commit | 59830b6ec4e07394e2ecfccb8683add64b4139d7 (patch) | |
| tree | 791dcd868e700f8bb97fc9902f5a282c481cf3f7 /Python | |
| parent | 95d75194ac2a96bef077d8ac6c5879c14ca8bb08 (diff) | |
| download | cpython-59830b6ec4e07394e2ecfccb8683add64b4139d7.zip cpython-59830b6ec4e07394e2ecfccb8683add64b4139d7.tar.gz cpython-59830b6ec4e07394e2ecfccb8683add64b4139d7.tar.bz2 | |
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 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 */ |