bpo-37031: Fix PyOS_AfterFork_Child() (GH-13537)

vstinner · web-flow · commit b49858b4b7b4 · 2019-05-24T15:20:23.000+02:00
PyOS_AfterFork_Child(): _PyInterpreterState_DeleteExceptMain() must
be called after _PyRuntimeState_ReInitThreads().

_PyRuntimeState_ReInitThreads() resets interpreters mutex after fork,
mutex used by _PyInterpreterState_DeleteExceptMain().
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -448,11 +448,11 @@ PyOS_AfterFork_Child(void)
 {
     _PyRuntimeState *runtime = &_PyRuntime;
     _PyGILState_Reinit(runtime);
-    _PyInterpreterState_DeleteExceptMain(runtime);
     _PyEval_ReInitThreads(runtime);
     _PyImport_ReInitLock();
     _PySignal_AfterFork();
     _PyRuntimeState_ReInitThreads(runtime);
+    _PyInterpreterState_DeleteExceptMain(runtime);
 
     run_at_forkers(_PyInterpreterState_Get()->after_forkers_child, 0);
 }

Original file line number	Diff line number	Diff line change
`@@ -448,11 +448,11 @@ PyOS_AfterFork_Child(void)`
`448`	`448`	`{`
`449`	`449`	`_PyRuntimeState *runtime = &_PyRuntime;`
`450`	`450`	`_PyGILState_Reinit(runtime);`
`451`		`- _PyInterpreterState_DeleteExceptMain(runtime);`
`452`	`451`	`_PyEval_ReInitThreads(runtime);`
`453`	`452`	`_PyImport_ReInitLock();`
`454`	`453`	`_PySignal_AfterFork();`
`455`	`454`	`_PyRuntimeState_ReInitThreads(runtime);`
	`455`	`+ _PyInterpreterState_DeleteExceptMain(runtime);`
`456`	`456`
`457`	`457`	`run_at_forkers(_PyInterpreterState_Get()->after_forkers_child, 0);`
`458`	`458`	`}`