bpo-38644: Pass tstate to _Py_FinishPendingCalls() (GH-17990)

vstinner · web-flow · commit 2b1df4592e16 · 2020-01-13T18:46:59.000+01:00
_Py_FinishPendingCalls() now expects a tstate argument, instead of a
runtime argument.
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -15,7 +15,7 @@ struct _frame;
 
 #include "pycore_pystate.h"   /* PyInterpreterState.eval_frame */
 
-PyAPI_FUNC(void) _Py_FinishPendingCalls(struct pyruntimestate *runtime);
+PyAPI_FUNC(void) _Py_FinishPendingCalls(PyThreadState *tstate);
 PyAPI_FUNC(void) _PyEval_Initialize(struct _ceval_runtime_state *);
 PyAPI_FUNC(void) _PyEval_FiniThreads(
     struct _ceval_runtime_state *ceval);
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -585,11 +585,11 @@ make_pending_calls(_PyRuntimeState *runtime)
 }
 
 void
-_Py_FinishPendingCalls(_PyRuntimeState *runtime)
+_Py_FinishPendingCalls(PyThreadState *tstate)
 {
     assert(PyGILState_Check());
 
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    _PyRuntimeState *runtime = tstate->interp->runtime;
     struct _pending_calls *pending = &runtime->ceval.pending;
 
     PyThread_acquire_lock(pending->lock, WAIT_LOCK);
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1340,7 +1340,7 @@ Py_FinalizeEx(void)
     wait_for_thread_shutdown(tstate);
 
     // Make any remaining pending calls.
-    _Py_FinishPendingCalls(runtime);
+    _Py_FinishPendingCalls(tstate);
 
     /* The interpreter is still entirely intact at this point, and the
      * exit funcs may be relying on that.  In particular, if some thread

Original file line number	Diff line number	Diff line change
`@@ -585,11 +585,11 @@ make_pending_calls(_PyRuntimeState *runtime)`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`void`
`588`		`-_Py_FinishPendingCalls(_PyRuntimeState *runtime)`
	`588`	`+_Py_FinishPendingCalls(PyThreadState *tstate)`
`589`	`589`	`{`
`590`	`590`	`assert(PyGILState_Check());`
`591`	`591`
`592`		`- PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);`
	`592`	`+ _PyRuntimeState *runtime = tstate->interp->runtime;`
`593`	`593`	`struct _pending_calls *pending = &runtime->ceval.pending;`
`594`	`594`
`595`	`595`	`PyThread_acquire_lock(pending->lock, WAIT_LOCK);`