diff options
| -rw-r--r-- | Lib/test/test_threading.py | 24 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 16 | ||||
| -rw-r--r-- | Modules/main.c | 29 | ||||
| -rw-r--r-- | Python/pythonrun.c | 30 |
5 files changed, 71 insertions, 29 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 0057d0e..e9ff4ca 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -284,6 +284,30 @@ class ThreadTests(unittest.TestCase): self.failIf(rc == 2, "interpreted was blocked") self.failUnless(rc == 0, "Unexpected error") + def test_join_nondaemon_on_shutdown(self): + # Issue 1722344 + # Raising SystemExit skipped threading._shutdown + import subprocess + p = subprocess.Popen([sys.executable, "-c", """if 1: + import threading + from time import sleep + + def child(): + sleep(1) + # As a non-daemon thread we SHOULD wake up and nothing + # should be torn down yet + print "Woke up, sleep function is:", sleep + + threading.Thread(target=child).start() + raise SystemExit + """], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + self.assertEqual(stdout.strip(), + "Woke up, sleep function is: <built-in function sleep>") + stderr = re.sub(r"^\[\d+ refs\]", "", stderr, re.MULTILINE).strip() + self.assertEqual(stderr, "") def test_enumerate_after_join(self): # Try hard to trigger #1703448: a thread is still returned in @@ -517,6 +517,7 @@ Kevin O'Connor Tim O'Malley Pascal Oberndoerfer Jeffrey Ollie +Adam Olsen Grant Olson Piet van Oostrum Jason Orendorff @@ -4,6 +4,22 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.6.5 +========================== + +*Release date: XX-XXX-20XX* + +Core and Builtins +----------------- + +- 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. + +Library +------- + + What's New in Python 2.6.4 final? ================================= diff --git a/Modules/main.c b/Modules/main.c index 1a58071..2d2bbf4 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -222,33 +222,6 @@ static int RunMainFromImporter(char *filename) } -/* 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. */ -#include "abstract.h" -static void -WaitForThreadShutdown(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 -} - /* Main program */ int @@ -620,8 +593,6 @@ Py_Main(int argc, char **argv) sts = PyRun_AnyFileFlags(stdin, "<stdin>", &cf) != 0; } - WaitForThreadShutdown(); - Py_Finalize(); #ifdef RISCOS if (Py_RISCOSWimpFlag) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 977ee21..f0dcfb3 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -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 @@ static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *, 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 @@ Py_Finalize(void) 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 @@ Py_FatalError(const char *msg) #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; |