Skip to content

Commit 1c1e68c

Browse files
vstinnervstinner
authored
bpo-38644: Use _PySys_Audit(): pass tstate explicitly (pythonGH-19183)
Add the dependency to tstate more explicit.
1 parent 33f15a1 commit 1c1e68c

File tree

4 files changed

+31
-25
lines changed

4 files changed

+31
-25
lines changed

‎Python/ceval.c‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "pycore_pyerrors.h"
1919
#include "pycore_pylifecycle.h"
2020
#include "pycore_pystate.h"
21+
#include "pycore_sysmodule.h"
2122
#include "pycore_tupleobject.h"
2223

2324
#include "code.h"
@@ -4693,9 +4694,10 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
46934694
/* The caller must hold the GIL */
46944695
assert(PyGILState_Check());
46954696

4696-
/* Call PySys_Audit() in the context of the current thread state,
4697+
/* Call _PySys_Audit() in the context of the current thread state,
46974698
even if tstate is not the current thread state. */
4698-
if (PySys_Audit("sys.setprofile", NULL) < 0) {
4699+
PyThreadState *current_tstate = _PyThreadState_GET();
4700+
if (_PySys_Audit(current_tstate, "sys.setprofile", NULL) < 0) {
46994701
return -1;
47004702
}
47014703

@@ -4721,7 +4723,7 @@ PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
47214723
{
47224724
PyThreadState *tstate = _PyThreadState_GET();
47234725
if (_PyEval_SetProfile(tstate, func, arg) < 0) {
4724-
/* Log PySys_Audit() error */
4726+
/* Log _PySys_Audit() error */
47254727
_PyErr_WriteUnraisableMsg("in PyEval_SetProfile", NULL);
47264728
}
47274729
}
@@ -4733,9 +4735,10 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
47334735
/* The caller must hold the GIL */
47344736
assert(PyGILState_Check());
47354737

4736-
/* Call PySys_Audit() in the context of the current thread state,
4738+
/* Call _PySys_Audit() in the context of the current thread state,
47374739
even if tstate is not the current thread state. */
4738-
if (PySys_Audit("sys.settrace", NULL) < 0) {
4740+
PyThreadState *current_tstate = _PyThreadState_GET();
4741+
if (_PySys_Audit(current_tstate, "sys.settrace", NULL) < 0) {
47394742
return -1;
47404743
}
47414744

@@ -4765,7 +4768,7 @@ PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
47654768
{
47664769
PyThreadState *tstate = _PyThreadState_GET();
47674770
if (_PyEval_SetTrace(tstate, func, arg) < 0) {
4768-
/* Log PySys_Audit() error */
4771+
/* Log _PySys_Audit() error */
47694772
_PyErr_WriteUnraisableMsg("in PyEval_SetTrace", NULL);
47704773
}
47714774
}
@@ -4790,7 +4793,7 @@ _PyEval_SetAsyncGenFirstiter(PyObject *firstiter)
47904793
{
47914794
PyThreadState *tstate = _PyThreadState_GET();
47924795

4793-
if (PySys_Audit("sys.set_asyncgen_hook_firstiter", NULL) < 0) {
4796+
if (_PySys_Audit(tstate, "sys.set_asyncgen_hook_firstiter", NULL) < 0) {
47944797
return -1;
47954798
}
47964799

@@ -4811,7 +4814,7 @@ _PyEval_SetAsyncGenFinalizer(PyObject *finalizer)
48114814
{
48124815
PyThreadState *tstate = _PyThreadState_GET();
48134816

4814-
if (PySys_Audit("sys.set_asyncgen_hook_finalizer", NULL) < 0) {
4817+
if (_PySys_Audit(tstate, "sys.set_asyncgen_hook_finalizer", NULL) < 0) {
48154818
return -1;
48164819
}
48174820

‎Python/errors.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "pycore_initconfig.h"
66
#include "pycore_pyerrors.h"
77
#include "pycore_pystate.h"
8+
#include "pycore_sysmodule.h"
89
#include "pycore_traceback.h"
910

1011
#ifndef __STDC__
@@ -1410,7 +1411,7 @@ _PyErr_WriteUnraisableMsg(const char *err_msg_str, PyObject *obj)
14101411
goto default_hook;
14111412
}
14121413

1413-
if (PySys_Audit("sys.unraisablehook", "OO", hook, hook_args) < 0) {
1414+
if (_PySys_Audit(tstate, "sys.unraisablehook", "OO", hook, hook_args) < 0) {
14141415
Py_DECREF(hook_args);
14151416
err_msg_str = "Exception ignored in audit hook";
14161417
obj = NULL;

‎Python/import.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "pycore_pylifecycle.h"
1111
#include "pycore_pymem.h"
1212
#include "pycore_pystate.h"
13+
#include "pycore_sysmodule.h"
1314
#include "errcode.h"
1415
#include "marshal.h"
1516
#include "code.h"
@@ -1735,10 +1736,10 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name)
17351736
PyObject *sys_path = PySys_GetObject("path");
17361737
PyObject *sys_meta_path = PySys_GetObject("meta_path");
17371738
PyObject *sys_path_hooks = PySys_GetObject("path_hooks");
1738-
if (PySys_Audit("import", "OOOOO",
1739-
abs_name, Py_None, sys_path ? sys_path : Py_None,
1740-
sys_meta_path ? sys_meta_path : Py_None,
1741-
sys_path_hooks ? sys_path_hooks : Py_None) < 0) {
1739+
if (_PySys_Audit(tstate, "import", "OOOOO",
1740+
abs_name, Py_None, sys_path ? sys_path : Py_None,
1741+
sys_meta_path ? sys_meta_path : Py_None,
1742+
sys_path_hooks ? sys_path_hooks : Py_None) < 0) {
17421743
return NULL;
17431744
}
17441745

‎Python/pythonrun.c‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "pycore_pyerrors.h"
1717
#include "pycore_pylifecycle.h"
1818
#include "pycore_pystate.h"
19+
#include "pycore_sysmodule.h"
1920
#include "grammar.h"
2021
#include "node.h"
2122
#include "token.h"
@@ -696,8 +697,8 @@ _PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars)
696697
}
697698
}
698699
hook = _PySys_GetObjectId(&PyId_excepthook);
699-
if (PySys_Audit("sys.excepthook", "OOOO", hook ? hook : Py_None,
700-
exception, v, tb) < 0) {
700+
if (_PySys_Audit(tstate, "sys.excepthook", "OOOO", hook ? hook : Py_None,
701+
exception, v, tb) < 0) {
701702
if (PyErr_ExceptionMatches(PyExc_RuntimeError)) {
702703
PyErr_Clear();
703704
goto done;
@@ -1100,7 +1101,7 @@ flush_io(void)
11001101
}
11011102

11021103
static PyObject *
1103-
run_eval_code_obj(PyCodeObject *co, PyObject *globals, PyObject *locals)
1104+
run_eval_code_obj(PyThreadState *tstate, PyCodeObject *co, PyObject *globals, PyObject *locals)
11041105
{
11051106
PyObject *v;
11061107
/*
@@ -1117,14 +1118,14 @@ run_eval_code_obj(PyCodeObject *co, PyObject *globals, PyObject *locals)
11171118

11181119
/* Set globals['__builtins__'] if it doesn't exist */
11191120
if (globals != NULL && PyDict_GetItemString(globals, "__builtins__") == NULL) {
1120-
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
1121-
if (PyDict_SetItemString(globals, "__builtins__", interp->builtins) < 0) {
1121+
if (PyDict_SetItemString(globals, "__builtins__",
1122+
tstate->interp->builtins) < 0) {
11221123
return NULL;
11231124
}
11241125
}
11251126

11261127
v = PyEval_EvalCode((PyObject*)co, globals, locals);
1127-
if (!v && PyErr_Occurred() == PyExc_KeyboardInterrupt) {
1128+
if (!v && _PyErr_Occurred(tstate) == PyExc_KeyboardInterrupt) {
11281129
_Py_UnhandledKeyboardInterrupt = 1;
11291130
}
11301131
return v;
@@ -1134,18 +1135,17 @@ static PyObject *
11341135
run_mod(mod_ty mod, PyObject *filename, PyObject *globals, PyObject *locals,
11351136
PyCompilerFlags *flags, PyArena *arena)
11361137
{
1137-
PyCodeObject *co;
1138-
PyObject *v;
1139-
co = PyAST_CompileObject(mod, filename, flags, -1, arena);
1138+
PyThreadState *tstate = _PyThreadState_GET();
1139+
PyCodeObject *co = PyAST_CompileObject(mod, filename, flags, -1, arena);
11401140
if (co == NULL)
11411141
return NULL;
11421142

1143-
if (PySys_Audit("exec", "O", co) < 0) {
1143+
if (_PySys_Audit(tstate, "exec", "O", co) < 0) {
11441144
Py_DECREF(co);
11451145
return NULL;
11461146
}
11471147

1148-
v = run_eval_code_obj(co, globals, locals);
1148+
PyObject *v = run_eval_code_obj(tstate, co, globals, locals);
11491149
Py_DECREF(co);
11501150
return v;
11511151
}
@@ -1154,6 +1154,7 @@ static PyObject *
11541154
run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
11551155
PyObject *locals, PyCompilerFlags *flags)
11561156
{
1157+
PyThreadState *tstate = _PyThreadState_GET();
11571158
PyCodeObject *co;
11581159
PyObject *v;
11591160
long magic;
@@ -1182,7 +1183,7 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals,
11821183
}
11831184
fclose(fp);
11841185
co = (PyCodeObject *)v;
1185-
v = run_eval_code_obj(co, globals, locals);
1186+
v = run_eval_code_obj(tstate, co, globals, locals);
11861187
if (v && flags)
11871188
flags->cf_flags |= (co->co_flags & PyCF_MASK);
11881189
Py_DECREF(co);

0 commit comments

Comments
 (0)