diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-17 06:07:49 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-17 06:07:49 (GMT) |
| commit | 068f81e11528b367f56bc3922554fa2dd00a7071 (patch) | |
| tree | be98d77a9cb3fbb705153fd16b87ae6e28fca65e /Python/pystate.c | |
| parent | 17548dda51ddd2fdc7641d8808b8f458f7f339fe (diff) | |
| download | cpython-068f81e11528b367f56bc3922554fa2dd00a7071.zip cpython-068f81e11528b367f56bc3922554fa2dd00a7071.tar.gz cpython-068f81e11528b367f56bc3922554fa2dd00a7071.tar.bz2 | |
avoid a deadlock with the interpreter head lock and the GIL during finalization
Diffstat (limited to 'Python/pystate.c')
| -rw-r--r-- | Python/pystate.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 2ac2fd5..8c1fad2 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -423,6 +423,14 @@ PyThreadState_DeleteCurrent() Py_FatalError( "PyThreadState_DeleteCurrent: no current tstate"); _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); + /* + 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); if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) PyThread_delete_key_value(autoTLSkey); tstate_delete_common(tstate); |