Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-106320: Remove _PyInterpreterState_Get() alias (#106321) 

Replace calls to the (removed) slow _PyInterpreterState_Get() with
fast inlined _PyInterpreterState_GET() function.
This commit is contained in:
Victor Stinner 2023-07-02 01:44:07 +02:00 committed by GitHub
parent 0530f4f646
commit 18b1fdebe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Doc/whatsnew/3.13.rst
View File

@ -605,3 +605,10 @@ Removed
* Remove ``cpython/pytime.h`` header file: it only contained private functions. * Remove ``cpython/pytime.h`` header file: it only contained private functions.
(Contributed by Victor Stinner in :gh:`106316`.) (Contributed by Victor Stinner in :gh:`106316`.)
* Remove ``_PyInterpreterState_Get()`` alias to
:c:func:`PyInterpreterState_Get()` which was kept for backward compatibility
with Python 3.8. The `pythoncapi-compat project
<https://github.com/python/pythoncapi-compat/>`__ can be used to get
:c:func:`PyInterpreterState_Get()` on Python 3.8 and older.
(Contributed by Victor Stinner in :gh:`106320`.)

5
Include/cpython/pystate.h
View File

@ -261,9 +261,6 @@ struct _ts {
/* other API */ /* other API */
// Alias for backward compatibility with Python 3.8
#define _PyInterpreterState_Get PyInterpreterState_Get
/* An alias for the internal _PyThreadState_New(), /* An alias for the internal _PyThreadState_New(),
kept for stable ABI compatibility. */ kept for stable ABI compatibility. */
PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
@ -295,7 +292,7 @@ PyAPI_FUNC(int) PyGILState_Check(void);
This function doesn't check for error. Return NULL before _PyGILState_Init() This function doesn't check for error. Return NULL before _PyGILState_Init()
is called and after _PyGILState_Fini() is called. is called and after _PyGILState_Fini() is called.
See also _PyInterpreterState_Get() and _PyInterpreterState_GET(). */ See also PyInterpreterState_Get() and _PyInterpreterState_GET(). */
PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void); PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
/* The implementation of sys._current_frames() Returns a dict mapping /* The implementation of sys._current_frames() Returns a dict mapping

2
Include/internal/pycore_pystate.h
View File

@ -108,7 +108,7 @@ _Py_EnsureFuncTstateNotNULL(const char *func, PyThreadState *tstate)
The caller must hold the GIL. The caller must hold the GIL.
See also _PyInterpreterState_Get() See also PyInterpreterState_Get()
and _PyGILState_GetInterpreterStateUnsafe(). */ and _PyGILState_GetInterpreterStateUnsafe(). */
static inline PyInterpreterState* _PyInterpreterState_GET(void) { static inline PyInterpreterState* _PyInterpreterState_GET(void) {
PyThreadState *tstate = _PyThreadState_GET(); PyThreadState *tstate = _PyThreadState_GET();

3
Misc/NEWS.d/next/C API/2023-07-02-00-00-20.gh-issue-106320.tZWcvG.rst Normal file
View File

@ -0,0 +1,3 @@
Remove ``_PyInterpreterState_Get()`` alias to
:c:func:`PyInterpreterState_Get()` which was kept for backward compatibility
with Python 3.8. Patch by Victor Stinner.

2
Modules/_threadmodule.c
View File

@ -1104,7 +1104,7 @@ thread_run(void *boot_raw)
static PyObject * static PyObject *
thread_daemon_threads_allowed(PyObject *module, PyObject *Py_UNUSED(ignored)) thread_daemon_threads_allowed(PyObject *module, PyObject *Py_UNUSED(ignored))
{ {
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
if (interp->feature_flags & Py_RTFLAGS_DAEMON_THREADS) { if (interp->feature_flags & Py_RTFLAGS_DAEMON_THREADS) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }

4
Objects/typeobject.c
View File

@ -6362,7 +6362,7 @@ object___reduce_ex___impl(PyObject *self, int protocol)
/*[clinic end generated code: output=2e157766f6b50094 input=f326b43fb8a4c5ff]*/ /*[clinic end generated code: output=2e157766f6b50094 input=f326b43fb8a4c5ff]*/
{ {
#define objreduce \ #define objreduce \
(_Py_INTERP_CACHED_OBJECT(_PyInterpreterState_Get(), objreduce)) (_Py_INTERP_CACHED_OBJECT(_PyInterpreterState_GET(), objreduce))
PyObject *reduce, *res; PyObject *reduce, *res;
if (objreduce == NULL) { if (objreduce == NULL) {
@ -9688,7 +9688,7 @@ resolve_slotdups(PyTypeObject *type, PyObject *name)
/* XXX Maybe this could be optimized more -- but is it worth it? */ /* XXX Maybe this could be optimized more -- but is it worth it? */
/* pname and ptrs act as a little cache */ /* pname and ptrs act as a little cache */
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
#define pname _Py_INTERP_CACHED_OBJECT(interp, type_slots_pname) #define pname _Py_INTERP_CACHED_OBJECT(interp, type_slots_pname)
#define ptrs _Py_INTERP_CACHED_OBJECT(interp, type_slots_ptrs) #define ptrs _Py_INTERP_CACHED_OBJECT(interp, type_slots_ptrs)
pytype_slotdef *p, **pp; pytype_slotdef *p, **pp;

2
Objects/unicodeobject.c
View File

@ -5831,7 +5831,7 @@ _PyUnicode_DecodeUnicodeEscapeInternal(const char *s,
PyObject *errorHandler = NULL; PyObject *errorHandler = NULL;
PyObject *exc = NULL; PyObject *exc = NULL;
_PyUnicode_Name_CAPI *ucnhash_capi; _PyUnicode_Name_CAPI *ucnhash_capi;
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
// so we can remember if we've seen an invalid escape char or not // so we can remember if we've seen an invalid escape char or not
*first_invalid_escape = NULL; *first_invalid_escape = NULL;

4
Python/ceval_gil.c
View File

@ -491,7 +491,7 @@ _ready:
void _PyEval_SetSwitchInterval(unsigned long microseconds) void _PyEval_SetSwitchInterval(unsigned long microseconds)
{ {
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
struct _gil_runtime_state *gil = interp->ceval.gil; struct _gil_runtime_state *gil = interp->ceval.gil;
assert(gil != NULL); assert(gil != NULL);
gil->interval = microseconds; gil->interval = microseconds;
@ -499,7 +499,7 @@ void _PyEval_SetSwitchInterval(unsigned long microseconds)
unsigned long _PyEval_GetSwitchInterval(void) unsigned long _PyEval_GetSwitchInterval(void)
{ {
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
struct _gil_runtime_state *gil = interp->ceval.gil; struct _gil_runtime_state *gil = interp->ceval.gil;
assert(gil != NULL); assert(gil != NULL);
return gil->interval; return gil->interval;

2
Python/hamt.c
View File

@ -2425,7 +2425,7 @@ hamt_alloc(void)
} }
#define _empty_hamt \ #define _empty_hamt \
(&_Py_INTERP_SINGLETON(_PyInterpreterState_Get(), hamt_empty)) (&_Py_INTERP_SINGLETON(_PyInterpreterState_GET(), hamt_empty))
PyHamtObject * PyHamtObject *
_PyHamt_New(void) _PyHamt_New(void)

2
Python/import.c
View File

@ -1123,7 +1123,7 @@ check_multi_interp_extensions(PyInterpreterState *interp)
int int
_PyImport_CheckSubinterpIncompatibleExtensionAllowed(const char *name) _PyImport_CheckSubinterpIncompatibleExtensionAllowed(const char *name)
{ {
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
if (check_multi_interp_extensions(interp)) { if (check_multi_interp_extensions(interp)) {
assert(!_Py_IsMainInterpreter(interp)); assert(!_Py_IsMainInterpreter(interp));
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,

18
Python/instrumentation.c
View File

@ -1219,7 +1219,7 @@ _Py_call_instrumentation_instruction(PyThreadState *tstate, _PyInterpreterFrame*
PyObject * PyObject *
_PyMonitoring_RegisterCallback(int tool_id, int event_id, PyObject *obj) _PyMonitoring_RegisterCallback(int tool_id, int event_id, PyObject *obj)
{ {
PyInterpreterState *is = _PyInterpreterState_Get(); PyInterpreterState *is = _PyInterpreterState_GET();
assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS); assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS);
assert(0 <= event_id && event_id < PY_MONITORING_EVENTS); assert(0 <= event_id && event_id < PY_MONITORING_EVENTS);
PyObject *callback = is->monitoring_callables[tool_id][event_id]; PyObject *callback = is->monitoring_callables[tool_id][event_id];
@ -1678,7 +1678,7 @@ int
_PyMonitoring_SetEvents(int tool_id, _PyMonitoringEventSet events) _PyMonitoring_SetEvents(int tool_id, _PyMonitoringEventSet events)
{ {
assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS); assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS);
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
assert(events < (1 << PY_MONITORING_UNGROUPED_EVENTS)); assert(events < (1 << PY_MONITORING_UNGROUPED_EVENTS));
if (check_tool(interp, tool_id)) { if (check_tool(interp, tool_id)) {
return -1; return -1;
@ -1696,7 +1696,7 @@ int
_PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEventSet events) _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEventSet events)
{ {
assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS); assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS);
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
assert(events < (1 << PY_MONITORING_UNGROUPED_EVENTS)); assert(events < (1 << PY_MONITORING_UNGROUPED_EVENTS));
if (check_tool(interp, tool_id)) { if (check_tool(interp, tool_id)) {
return -1; return -1;
@ -1758,7 +1758,7 @@ monitoring_use_tool_id_impl(PyObject *module, int tool_id, PyObject *name)
PyErr_SetString(PyExc_ValueError, "tool name must be a str"); PyErr_SetString(PyExc_ValueError, "tool name must be a str");
return NULL; return NULL;
} }
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
if (interp->monitoring_tool_names[tool_id] != NULL) { if (interp->monitoring_tool_names[tool_id] != NULL) {
PyErr_Format(PyExc_ValueError, "tool %d is already in use", tool_id); PyErr_Format(PyExc_ValueError, "tool %d is already in use", tool_id);
return NULL; return NULL;
@ -1782,7 +1782,7 @@ monitoring_free_tool_id_impl(PyObject *module, int tool_id)
if (check_valid_tool(tool_id)) { if (check_valid_tool(tool_id)) {
return NULL; return NULL;
} }
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
Py_CLEAR(interp->monitoring_tool_names[tool_id]); Py_CLEAR(interp->monitoring_tool_names[tool_id]);
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -1804,7 +1804,7 @@ monitoring_get_tool_impl(PyObject *module, int tool_id)
if (check_valid_tool(tool_id)) { if (check_valid_tool(tool_id)) {
return NULL; return NULL;
} }
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
PyObject *name = interp->monitoring_tool_names[tool_id]; PyObject *name = interp->monitoring_tool_names[tool_id];
if (name == NULL) { if (name == NULL) {
Py_RETURN_NONE; Py_RETURN_NONE;
@ -1865,7 +1865,7 @@ monitoring_get_events_impl(PyObject *module, int tool_id)
if (check_valid_tool(tool_id)) { if (check_valid_tool(tool_id)) {
return -1; return -1;
} }
_Py_Monitors *m = &_PyInterpreterState_Get()->monitors; _Py_Monitors *m = &_PyInterpreterState_GET()->monitors;
_PyMonitoringEventSet event_set = get_events(m, tool_id); _PyMonitoringEventSet event_set = get_events(m, tool_id);
return event_set; return event_set;
} }
@ -1990,7 +1990,7 @@ monitoring_restart_events_impl(PyObject *module)
* last restart version > instrumented version for all code objects * last restart version > instrumented version for all code objects
* last restart version < current version * last restart version < current version
*/ */
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
interp->last_restart_version = interp->monitoring_version + 1; interp->last_restart_version = interp->monitoring_version + 1;
interp->monitoring_version = interp->last_restart_version + 1; interp->monitoring_version = interp->last_restart_version + 1;
if (instrument_all_executing_code_objects(interp)) { if (instrument_all_executing_code_objects(interp)) {
@ -2038,7 +2038,7 @@ static PyObject *
monitoring__all_events_impl(PyObject *module) monitoring__all_events_impl(PyObject *module)
/*[clinic end generated code: output=6b7581e2dbb690f6 input=62ee9672c17b7f0e]*/ /*[clinic end generated code: output=6b7581e2dbb690f6 input=62ee9672c17b7f0e]*/
{ {
PyInterpreterState *interp = _PyInterpreterState_Get(); PyInterpreterState *interp = _PyInterpreterState_GET();
PyObject *res = PyDict_New(); PyObject *res = PyDict_New();
if (res == NULL) { if (res == NULL) {
return NULL; return NULL;