mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-09 20:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #1856: Avoid crashes and lockups when daemon threads run while the

Browse source 
interpreter is shutting down; instead, these threads are now killed when
they try to take the GIL.
This commit is contained in:
Antoine Pitrou 2011-05-04 20:02:30 +02:00
parent e548f5a001
commit 0d5e52d346
6 changed files with 69 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Python/pythonrun.c
View file

@ -90,6 +90,8 @@ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
int Py_NoUserSiteDirectory = 0; /* for -s and site.py */
int Py_UnbufferedStdioFlag = 0; /* Unbuffered binary std{in,out,err} */
PyThreadState *_Py_Finalizing = NULL;
/* PyModule_GetWarningsModule is no longer necessary as of 2.6
since _warnings is builtin. This API should not be used. */
PyObject *
@ -188,6 +190,7 @@ Py_InitializeEx(int install_sigs)
if (initialized)
return;
initialized = 1;
_Py_Finalizing = NULL;
#if defined(HAVE_LANGINFO_H) && defined(HAVE_SETLOCALE)
/* Set up the LC_CTYPE locale, so we can obtain
@ -388,15 +391,19 @@ Py_Finalize(void)
* the threads created via Threading.
*/
call_py_exitfuncs();
initialized = 0;
/* Flush stdout+stderr */
flush_std_files();
/* Get current thread state and interpreter pointer */
tstate = PyThreadState_GET();
interp = tstate->interp;
/* Remaining threads (e.g. daemon threads) will automatically exit
after taking the GIL (in PyEval_RestoreThread()). */
_Py_Finalizing = tstate;
initialized = 0;
/* Flush stdout+stderr */
flush_std_files();
/* Disable signal handling */
PyOS_FiniInterrupts();