Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 56781:2abc3b4bce7c 2.6
Merged revisions 75570,75574,75624 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75570 | antoine.pitrou | 2009-10-20 23:29:37 +0200 (mar., 20 oct. 2009) | 6 lines
Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which
fixes the problem of some exceptions being thrown at shutdown when the
interpreter is killed. Patch by Adam Olsen.
........
r75574 | antoine.pitrou | 2009-10-20 23:59:25 +0200 (mar., 20 oct. 2009) | 4 lines
Test wouldn't work in debug mode.
We probably need a function in test_support to handle this.
........
r75624 | antoine.pitrou | 2009-10-23 14:01:13 +0200 (ven., 23 oct. 2009) | 3 lines
Fix Windows buildbot failure
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Tue, 27 Oct 2009 12:48:52 +0000 |
| parents | cb58c973985c |
| children | 8d8c9bf2a04e |
line wrap: on
line diff
--- a/Python/pythonrun.c Tue Oct 27 12:32:18 2009 +0000 +++ b/Python/pythonrun.c Tue Oct 27 12:48:52 2009 +0000 @@ -17,6 +17,7 @@ #include "ast.h" #include "eval.h" #include "marshal.h" +#include "abstract.h" #ifdef HAVE_SIGNAL_H #include <signal.h> @@ -61,6 +62,7 @@ PyCompilerFlags *); static void err_input(perrdetail *); static void initsigs(void); +static void wait_for_thread_shutdown(void); static void call_sys_exitfunc(void); static void call_ll_exitfuncs(void); extern void _PyUnicode_Init(void); @@ -387,6 +389,8 @@ if (!initialized) return; + wait_for_thread_shutdown(); + /* The interpreter is still entirely intact at this point, and the * exit funcs may be relying on that. In particular, if some thread * or exit func is still waiting to do an import, the import machinery @@ -1663,6 +1667,32 @@ #include "pythread.h" #endif +/* Wait until threading._shutdown completes, provided + the threading module was imported in the first place. + The shutdown routine will wait until all non-daemon + "threading" threads have completed. */ +static void +wait_for_thread_shutdown(void) +{ +#ifdef WITH_THREAD + PyObject *result; + PyThreadState *tstate = PyThreadState_GET(); + PyObject *threading = PyMapping_GetItemString(tstate->interp->modules, + "threading"); + if (threading == NULL) { + /* threading not imported */ + PyErr_Clear(); + return; + } + result = PyObject_CallMethod(threading, "_shutdown", ""); + if (result == NULL) + PyErr_WriteUnraisable(threading); + else + Py_DECREF(result); + Py_DECREF(threading); +#endif +} + #define NEXITFUNCS 32 static void (*exitfuncs[NEXITFUNCS])(void); static int nexitfuncs = 0;