diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-05-04 18:02:30 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-05-04 18:02:30 (GMT) |
| commit | 0d5e52d3469a310001afe50689f77ddba6d554d1 (patch) | |
| tree | 0427334f46907890af771153a28f2c39441a8d89 /Python/ceval.c | |
| parent | e548f5a0018fb44ed3a2a365ff0c8c87e397eedd (diff) | |
| download | cpython-0d5e52d3469a310001afe50689f77ddba6d554d1.zip cpython-0d5e52d3469a310001afe50689f77ddba6d554d1.tar.gz cpython-0d5e52d3469a310001afe50689f77ddba6d554d1.tar.bz2 | |
Issue #1856: Avoid crashes and lockups when daemon threads run while the
interpreter is shutting down; instead, these threads are now killed when
they try to take the GIL.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 43a5c90..705ed41 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -440,6 +440,12 @@ PyEval_RestoreThread(PyThreadState *tstate) if (gil_created()) { int err = errno; take_gil(tstate); + /* _Py_Finalizing is protected by the GIL */ + if (_Py_Finalizing && tstate != _Py_Finalizing) { + drop_gil(tstate); + PyThread_exit_thread(); + assert(0); /* unreachable */ + } errno = err; } #endif |