Fix daemon thread shutdown.

Author: ZeroIntensity

Lib/test/test_interpreters/test_api.py

@@ -691,7 +691,7 @@ def test_remaining_daemon_threads(self):
             import time
 
             def task():
-                time.sleep(100)
+                time.sleep(3)
 
             threads = [threading.Thread(target=task, daemon=True) for _ in range(3)]
             for t in threads:

Python/pylifecycle.c

@@ -2449,14 +2449,17 @@ Py_EndInterpreter(PyThreadState *tstate)
     _Py_FinishPendingCalls(tstate);
 
     _PyAtExit_Call(tstate->interp);
-    _PyRuntimeState *runtime = interp->runtime;
-    _PyEval_StopTheWorldAll(runtime);
-    PyThreadState *list = _PyThreadState_RemoveExcept(tstate);
-
+    _PyEval_StopTheWorld(interp);
     /* Remaining daemon threads will automatically exit
        when they attempt to take the GIL (ex: PyEval_RestoreThread()). */
     _PyInterpreterState_SetFinalizing(interp, tstate);
-    _PyEval_StartTheWorldAll(runtime);
+
+    PyThreadState *list = _PyThreadState_RemoveExcept(tstate);
+    for (PyThreadState *p = list; p != NULL; p = p->next) {
+        _PyThreadState_SetShuttingDown(p);
+    }
+
+    _PyEval_StartTheWorld(interp);
     _PyThreadState_DeleteList(list, /*is_after_fork=*/0);
 
     // XXX Call something like _PyImport_Disable() here?