ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

avoid crashes and lockups from daemon threads during interpreter shutdown (#1856)

Browse Source
This commit is contained in:
Benjamin Peterson
2014-06-16 19:39:18 -07:00
parent 1a6561e2f5
commit c0bc4eff50
6 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Python/pythonrun.c
View File

@@ -91,6 +91,8 @@ int _Py_QnewFlag = 0;
int Py_NoUserSiteDirectory = 0; /* for -s and site.py */
int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */
PyThreadState *_Py_Finalizing = NULL;
/* Hack to force loading of object files */
int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \
@@ -163,6 +165,7 @@ Py_InitializeEx(int install_sigs)
if (initialized)
return;
initialized = 1;
_Py_Finalizing = NULL;
if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
Py_DebugFlag = add_flag(Py_DebugFlag, p);
@@ -422,12 +425,16 @@ Py_Finalize(void)
* the threads created via Threading.
*/
call_sys_exitfunc();
initialized = 0;
/* 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;
/* Disable signal handling */
PyOS_FiniInterrupts();