mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 20:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-40268: Rename _PyInterpreterState_GET_UNSAFE() (GH-19509)

Browse source 
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:
Victor Stinner 2020-04-14 15:14:01 +02:00 • committed by GitHub
parent 4a3fe08353
commit 81a7be3fa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_io/textio.c
View file

@ -994,7 +994,7 @@ io_check_errors(PyObject *errors)
{
assert(errors != NULL && errors != Py_None);
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyInterpreterState *interp = _PyInterpreterState_GET();
#ifndef Py_DEBUG
/* In release mode, only check in development mode (-X dev) */
if (!_PyInterpreterState_GetConfig(interp)->dev_mode) {

6
Modules/_threadmodule.c
View file

@ -1091,7 +1091,7 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
boot = PyMem_NEW(struct bootstate, 1);
if (boot == NULL)
return PyErr_NoMemory();
boot->interp = _PyInterpreterState_GET_UNSAFE();
boot->interp = _PyInterpreterState_GET();
boot->func = func;
boot->args = args;
boot->keyw = keyw;
@ -1213,7 +1213,7 @@ particular thread within a system.");
static PyObject *
thread__count(PyObject *self, PyObject *Py_UNUSED(ignored))
{
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyInterpreterState *interp = _PyInterpreterState_GET();
return PyLong_FromLong(interp->num_threads);
}
@ -1556,7 +1556,7 @@ PyInit__thread(void)
PyObject *m, *d, *v;
double time_max;
double timeout_max;
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyInterpreterState *interp = _PyInterpreterState_GET();
/* Initialize types: */
if (PyType_Ready(&localdummytype) < 0)

2
Modules/main.c
View file

@ -498,7 +498,7 @@ pymain_repl(PyConfig *config, PyCompilerFlags *cf, int *exitcode)
static void
pymain_run_python(int *exitcode)
{
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyInterpreterState *interp = _PyInterpreterState_GET();
/* pymain_run_stdin() modify the config */
PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(interp);

14
Modules/posixmodule.c
View file

@ -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;
}

4
Modules/signalmodule.c
View file

@ -1784,7 +1784,7 @@ PyOS_FiniInterrupts(void)
int
PyOS_InterruptOccurred(void)
{
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyInterpreterState *interp = _PyInterpreterState_GET();
if (!_Py_ThreadCanHandleSignals(interp)) {
return 0;
}
@ -1821,7 +1821,7 @@ _PySignal_AfterFork(void)
int
_PyOS_IsMainThread(void)
{
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyInterpreterState *interp = _PyInterpreterState_GET();
return _Py_ThreadCanHandleSignals(interp);
}