Skip to content

bpo-39947: Use _PyInterpreterState_GET_UNSAFE() #18978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2020
Merged

bpo-39947: Use _PyInterpreterState_GET_UNSAFE() #18978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,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();
boot->interp = _PyInterpreterState_GET_UNSAFE();
boot->func = func;
boot->args = args;
boot->keyw = keyw;
Expand Down Expand Up @@ -1183,7 +1183,7 @@ particular thread within a system.");
static PyObject *
thread__count(PyObject *self, PyObject *Py_UNUSED(ignored))
{
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
return PyLong_FromLong(interp->num_threads);
}

Expand Down Expand Up @@ -1542,7 +1542,7 @@ PyInit__thread(void)
PyObject *m, *d, *v;
double time_max;
double timeout_max;
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();

/* Initialize types: */
if (PyType_Ready(&localdummytype) < 0)
Expand Down
14 changes: 7 additions & 7 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ run_at_forkers(PyObject *lst, int reverse)
void
PyOS_BeforeFork(void)
{
run_at_forkers(_PyInterpreterState_Get()->before_forkers, 1);
run_at_forkers(_PyInterpreterState_GET_UNSAFE()->before_forkers, 1);

_PyImport_AcquireLock();
}
Expand All @@ -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()->after_forkers_parent, 0);
run_at_forkers(_PyInterpreterState_GET_UNSAFE()->after_forkers_parent, 0);
}

void
Expand All @@ -476,7 +476,7 @@ PyOS_AfterFork_Child(void)
_PyRuntimeState_ReInitThreads(runtime);
_PyInterpreterState_DeleteExceptMain(runtime);

run_at_forkers(_PyInterpreterState_Get()->after_forkers_child, 0);
run_at_forkers(_PyInterpreterState_GET_UNSAFE()->after_forkers_child, 0);
}

static int
Expand Down Expand Up @@ -6177,7 +6177,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();
interp = _PyInterpreterState_GET_UNSAFE();

if (register_at_forker(&interp->before_forkers, before)) {
return NULL;
Expand Down Expand Up @@ -6208,7 +6208,7 @@ os_fork1_impl(PyObject *module)
{
pid_t pid;

if (_PyInterpreterState_Get() != PyInterpreterState_Main()) {
if (_PyInterpreterState_GET_UNSAFE() != PyInterpreterState_Main()) {
PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters");
return NULL;
}
Expand Down Expand Up @@ -6243,7 +6243,7 @@ os_fork_impl(PyObject *module)
{
pid_t pid;

if (_PyInterpreterState_Get() != PyInterpreterState_Main()) {
if (_PyInterpreterState_GET_UNSAFE() != PyInterpreterState_Main()) {
PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters");
return NULL;
}
Expand Down Expand Up @@ -6851,7 +6851,7 @@ os_forkpty_impl(PyObject *module)
int master_fd = -1;
pid_t pid;

if (_PyInterpreterState_Get() != PyInterpreterState_Main()) {
if (_PyInterpreterState_GET_UNSAFE() != PyInterpreterState_Main()) {
PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters");
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions Objects/moduleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ _add_methods_to_object(PyObject *module, PyObject *name, PyMethodDef *functions)
PyObject *
PyModule_Create2(struct PyModuleDef* module, int module_api_version)
{
if (!_PyImport_IsInitialized(_PyInterpreterState_Get())) {
if (!_PyImport_IsInitialized(_PyInterpreterState_GET_UNSAFE())) {
PyErr_SetString(PyExc_SystemError,
"Python import machinery not initialized");
return NULL;
Expand Down Expand Up @@ -699,7 +699,7 @@ module_dealloc(PyModuleObject *m)
static PyObject *
module_repr(PyModuleObject *m)
{
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();

return PyObject_CallMethod(interp->importlib, "_module_repr", "O", m);
}
Expand Down
8 changes: 4 additions & 4 deletions Python/codecs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static int _PyCodecRegistry_Init(void); /* Forward */

int PyCodec_Register(PyObject *search_function)
{
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
goto onError;
if (search_function == NULL) {
Expand Down Expand Up @@ -187,7 +187,7 @@ int _PyCodec_Forget(const char *encoding)
PyObject *v;
int result;

PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
if (interp->codec_search_path == NULL) {
return -1;
}
Expand Down Expand Up @@ -620,7 +620,7 @@ PyObject *_PyCodec_DecodeText(PyObject *object,
Return 0 on success, -1 on error */
int PyCodec_RegisterError(const char *name, PyObject *error)
{
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
return -1;
if (!PyCallable_Check(error)) {
Expand Down Expand Up @@ -1492,7 +1492,7 @@ static int _PyCodecRegistry_Init(void)
}
};

PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyObject *mod;

if (interp->codec_search_path != NULL)
Expand Down
4 changes: 2 additions & 2 deletions Python/dynload_shlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* Support for dynamic loading of extension modules */

#include "Python.h"
#include "pycore_pystate.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET_UNSAFE()
#include "importdl.h"

#include <sys/types.h>
Expand Down Expand Up @@ -94,7 +94,7 @@ _PyImport_FindSharedFuncptr(const char *prefix,
}
}

dlopenflags = _PyInterpreterState_Get()->dlopenflags;
dlopenflags = _PyInterpreterState_GET_UNSAFE()->dlopenflags;

handle = dlopen(pathname, dlopenflags);

Expand Down
4 changes: 2 additions & 2 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ long
PyImport_GetMagicNumber(void)
{
long res;
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
PyObject *external, *pyc_magic;

external = PyObject_GetAttrString(interp->importlib, "_bootstrap_external");
Expand Down Expand Up @@ -2412,7 +2412,7 @@ PyInit__imp(void)
goto failure;
}

const wchar_t *mode = _PyInterpreterState_Get()->config.check_hash_pycs_mode;
const wchar_t *mode = _PyInterpreterState_GET_UNSAFE()->config.check_hash_pycs_mode;
PyObject *pyc_mode = PyUnicode_FromWideChar(mode, -1);
if (pyc_mode == NULL) {
goto failure;
Expand Down
6 changes: 3 additions & 3 deletions Python/initconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2572,8 +2572,8 @@ _Py_GetConfigsAsDict(void)
Py_CLEAR(dict);

/* pre config */
PyInterpreterState *interp = _PyInterpreterState_Get();
const PyPreConfig *pre_config = &_PyRuntime.preconfig;
PyThreadState *tstate = _PyThreadState_GET();
const PyPreConfig *pre_config = &tstate->interp->runtime->preconfig;
dict = _PyPreConfig_AsDict(pre_config);
if (dict == NULL) {
goto error;
Expand All @@ -2584,7 +2584,7 @@ _Py_GetConfigsAsDict(void)
Py_CLEAR(dict);

/* core config */
const PyConfig *config = &interp->config;
const PyConfig *config = &tstate->interp->config;
dict = config_as_dict(config);
if (dict == NULL) {
goto error;
Expand Down
6 changes: 3 additions & 3 deletions Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str, PyCompilerFlags *
PyCompilerFlags local_flags = _PyCompilerFlags_INIT;
int nomem_count = 0;
#ifdef Py_REF_DEBUG
int show_ref_count = _PyInterpreterState_Get()->config.show_ref_count;
int show_ref_count = _PyInterpreterState_GET_UNSAFE()->config.show_ref_count;
#endif

filename = PyUnicode_DecodeFSDefault(filename_str);
Expand Down Expand Up @@ -346,7 +346,7 @@ set_main_loader(PyObject *d, const char *filename, const char *loader_name)
filename_obj = PyUnicode_DecodeFSDefault(filename);
if (filename_obj == NULL)
return -1;
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
bootstrap = PyObject_GetAttrString(interp->importlib,
"_bootstrap_external");
if (bootstrap != NULL) {
Expand Down Expand Up @@ -1117,7 +1117,7 @@ run_eval_code_obj(PyCodeObject *co, PyObject *globals, PyObject *locals)

/* Set globals['__builtins__'] if it doesn't exist */
if (globals != NULL && PyDict_GetItemString(globals, "__builtins__") == NULL) {
PyInterpreterState *interp = _PyInterpreterState_Get();
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
if (PyDict_SetItemString(globals, "__builtins__", interp->builtins) < 0) {
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion Python/thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ PyThread_init_thread(void)
size_t
PyThread_get_stacksize(void)
{
return _PyInterpreterState_Get()->pythread_stacksize;
return _PyInterpreterState_GET_UNSAFE()->pythread_stacksize;
}

/* Only platforms defining a THREAD_SET_STACKSIZE() macro
Expand Down