PyOS_AfterFork_Child() pass tstate to _PyEval_ReInitThreads() (GH-20598) · python-emscripten/cpython@317bab0 · GitHub

1. python-emscripten
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 317bab0

Browse filesBrowse the repository at this point in the historyBrowse files

vstinner

authored

PyOS_AfterFork_Child() pass tstate to _PyEval_ReInitThreads() (pythonGH-20598)

1 parent 45b34a0 commit 317bab0
Copy full SHA for 317bab0

3 files changed

+9-6Lines changed: 9 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Include/internal
  • pycore_ceval.h
• Modules
  • posixmodule.c
• Python
  • ceval.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Include/internal/pycore_ceval.h‎

Copy file name to clipboardExpand all lines: Include/internal/pycore_ceval.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ PyAPI_FUNC(int) _PyEval_AddPendingCall(
25	25	void *arg);
26	26	PyAPI_FUNC(void) _PyEval_SignalAsyncExc(PyThreadState *tstate);
27	27	#ifdef HAVE_FORK
28		- extern PyStatus _PyEval_ReInitThreads(struct pyruntimestate *runtime);
	28	+ extern PyStatus _PyEval_ReInitThreads(PyThreadState *tstate);
29	29	#endif
30	30	PyAPI_FUNC(void) _PyEval_SetCoroutineOriginTrackingDepth(
31	31	PyThreadState *tstate,

Collapse file

‎Modules/posixmodule.c‎

Copy file name to clipboardExpand all lines: Modules/posixmodule.c

+6-2Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -470,7 +470,10 @@ PyOS_AfterFork_Child(void)
470	470	goto fatal_error;
471	471	}
472	472
473		- status = _PyEval_ReInitThreads(runtime);
	473	+ PyThreadState *tstate = _PyThreadState_GET();
	474	+ _Py_EnsureTstateNotNULL(tstate);
	475	+
	476	+ status = _PyEval_ReInitThreads(tstate);
474	477	if (_PyStatus_EXCEPTION(status)) {
475	478	goto fatal_error;
476	479	}
@@ -491,8 +494,9 @@ PyOS_AfterFork_Child(void)
491	494	if (_PyStatus_EXCEPTION(status)) {
492	495	goto fatal_error;
493	496	}
	497	+ assert(_PyThreadState_GET() == tstate);
494	498
495		- run_at_forkers(_PyInterpreterState_GET()->after_forkers_child, 0);
	499	+ run_at_forkers(tstate->interp->after_forkers_child, 0);
496	500	return;
497	501
498	502	fatal_error:

Collapse file

‎Python/ceval.c‎

Copy file name to clipboardExpand all lines: Python/ceval.c

+2-3Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -436,10 +436,9 @@ PyEval_ReleaseThread(PyThreadState *tstate)
436	436	which are not running in the child process, and clear internal locks
437	437	which might be held by those threads. */
438	438	PyStatus
439		- _PyEval_ReInitThreads(_PyRuntimeState *runtime)
	439	+ _PyEval_ReInitThreads(PyThreadState *tstate)
440	440	{
441		- PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
442		- _Py_EnsureTstateNotNULL(tstate);
	441	+ _PyRuntimeState *runtime = tstate->interp->runtime;
443	442
444	443	#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
445	444	struct _gil_runtime_state *gil = &tstate->interp->ceval.gil;

0 commit comments

Comments

0 (0)