summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
Diffstat (limited to 'Python')
-rw-r--r--Python/pylifecycle.c4
-rw-r--r--Python/pystate.c35
2 files changed, 39 insertions, 0 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index bc76822..4bd01ad 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -3138,6 +3138,10 @@ call_ll_exitfuncs(_PyRuntimeState *runtime)
void _Py_NO_RETURN
Py_Exit(int sts)
{
+ PyThreadState *tstate = _PyThreadState_GET();
+ if (tstate != NULL && _PyThreadState_IsRunningMain(tstate)) {
+ _PyInterpreterState_SetNotRunningMain(tstate->interp);
+ }
if (Py_FinalizeEx() < 0) {
sts = 120;
}
diff --git a/Python/pystate.c b/Python/pystate.c
index 5332b8a..6d63eac 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -1050,6 +1050,30 @@ _PyInterpreterState_IsRunningMain(PyInterpreterState *interp)
return 0;
}
+#ifndef NDEBUG
+static int
+is_running_main(PyThreadState *tstate)
+{
+ if (tstate->interp->threads.main != NULL) {
+ return tstate == tstate->interp->threads.main;
+ }
+ return 0;
+}
+#endif
+
+int
+_PyThreadState_IsRunningMain(PyThreadState *tstate)
+{
+ PyInterpreterState *interp = tstate->interp;
+ if (interp->threads.main != NULL) {
+ return tstate == interp->threads.main;
+ }
+ if (_Py_IsMainInterpreter(interp)) {
+ return tstate->thread_id == interp->runtime->main_thread;
+ }
+ return 0;
+}
+
int
_PyInterpreterState_FailIfRunningMain(PyInterpreterState *interp)
{
@@ -1061,6 +1085,15 @@ _PyInterpreterState_FailIfRunningMain(PyInterpreterState *interp)
return 0;
}
+void
+_PyInterpreterState_ReinitRunningMain(PyThreadState *tstate)
+{
+ PyInterpreterState *interp = tstate->interp;
+ if (interp->threads.main != tstate) {
+ interp->threads.main = NULL;
+ }
+}
+
//----------
// accessors
@@ -1543,6 +1576,7 @@ PyThreadState_Clear(PyThreadState *tstate)
{
assert(tstate->_status.initialized && !tstate->_status.cleared);
assert(current_fast_get()->interp == tstate->interp);
+ assert(!is_running_main(tstate));
// XXX assert(!tstate->_status.bound || tstate->_status.unbound);
tstate->_status.finalizing = 1; // just in case
@@ -1641,6 +1675,7 @@ tstate_delete_common(PyThreadState *tstate)
assert(tstate->_status.cleared && !tstate->_status.finalized);
assert(tstate->state != _Py_THREAD_ATTACHED);
tstate_verify_not_active(tstate);
+ assert(!is_running_main(tstate));
PyInterpreterState *interp = tstate->interp;
if (interp == NULL) {