mirror of
https://github.com/python/cpython.git
synced 2025-08-01 23:53:15 +00:00
bpo-40268: Rename _PyInterpreterState_GET_UNSAFE() (GH-19509)
Rename _PyInterpreterState_GET_UNSAFE() to _PyInterpreterState_GET() for consistency with _PyThreadState_GET() and to have a shorter name (help to fit into 80 columns). Add also "assert(tstate != NULL);" to the function.
This commit is contained in:
parent
4a3fe08353
commit
81a7be3fa2
23 changed files with 53 additions and 52 deletions
|
@ -451,7 +451,7 @@ run_at_forkers(PyObject *lst, int reverse)
|
|||
void
|
||||
PyOS_BeforeFork(void)
|
||||
{
|
||||
run_at_forkers(_PyInterpreterState_GET_UNSAFE()->before_forkers, 1);
|
||||
run_at_forkers(_PyInterpreterState_GET()->before_forkers, 1);
|
||||
|
||||
_PyImport_AcquireLock();
|
||||
}
|
||||
|
@ -462,7 +462,7 @@ PyOS_AfterFork_Parent(void)
|
|||
if (_PyImport_ReleaseLock() <= 0)
|
||||
Py_FatalError("failed releasing import lock after fork");
|
||||
|
||||
run_at_forkers(_PyInterpreterState_GET_UNSAFE()->after_forkers_parent, 0);
|
||||
run_at_forkers(_PyInterpreterState_GET()->after_forkers_parent, 0);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -476,7 +476,7 @@ PyOS_AfterFork_Child(void)
|
|||
_PyRuntimeState_ReInitThreads(runtime);
|
||||
_PyInterpreterState_DeleteExceptMain(runtime);
|
||||
|
||||
run_at_forkers(_PyInterpreterState_GET_UNSAFE()->after_forkers_child, 0);
|
||||
run_at_forkers(_PyInterpreterState_GET()->after_forkers_child, 0);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -6185,7 +6185,7 @@ os_register_at_fork_impl(PyObject *module, PyObject *before,
|
|||
check_null_or_callable(after_in_parent, "after_in_parent")) {
|
||||
return NULL;
|
||||
}
|
||||
interp = _PyInterpreterState_GET_UNSAFE();
|
||||
interp = _PyInterpreterState_GET();
|
||||
|
||||
if (register_at_forker(&interp->before_forkers, before)) {
|
||||
return NULL;
|
||||
|
@ -6216,7 +6216,7 @@ os_fork1_impl(PyObject *module)
|
|||
{
|
||||
pid_t pid;
|
||||
|
||||
if (_PyInterpreterState_GET_UNSAFE() != PyInterpreterState_Main()) {
|
||||
if (_PyInterpreterState_GET() != PyInterpreterState_Main()) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters");
|
||||
return NULL;
|
||||
}
|
||||
|
@ -6251,7 +6251,7 @@ os_fork_impl(PyObject *module)
|
|||
{
|
||||
pid_t pid;
|
||||
|
||||
if (_PyInterpreterState_GET_UNSAFE() != PyInterpreterState_Main()) {
|
||||
if (_PyInterpreterState_GET() != PyInterpreterState_Main()) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters");
|
||||
return NULL;
|
||||
}
|
||||
|
@ -6859,7 +6859,7 @@ os_forkpty_impl(PyObject *module)
|
|||
int master_fd = -1;
|
||||
pid_t pid;
|
||||
|
||||
if (_PyInterpreterState_GET_UNSAFE() != PyInterpreterState_Main()) {
|
||||
if (_PyInterpreterState_GET() != PyInterpreterState_Main()) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters");
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue