Skip to content

bpo-40512: Store pointer to interpreter state in a thread local variable #29228

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

Closed
markshannon wants to merge 11 commits into from
Closed

bpo-40512: Store pointer to interpreter state in a thread local variable #29228

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7c7e2b2
Use a thread-local variable to store a pointer to the interpreter-state.
markshannon Oct 25, 2021
73c410b
Add NEWS
markshannon Oct 26, 2021
f22036b
Merge branch 'main' into thread-local-interpreter-state
markshannon Oct 27, 2021
f33f4a4
Revert erroneous change.
markshannon Oct 28, 2021
55cc2e4
Fix misleading comment and formatting.
markshannon Oct 28, 2021
4b83356
Ensure that FatalError is raised for NULL interpreter state in debug …
markshannon Nov 1, 2021
8502145
Merge branch 'main' into thread-local-interpreter-state
markshannon Nov 1, 2021
28bc042
Fixup PY_ZERO and PY_ONE macros.
markshannon Nov 1, 2021
193b646
Merge branch 'main' into thread-local-interpreter-state
markshannon Nov 16, 2021
a30b7e6
Merge branch 'main' into thread-local-interpreter-state
markshannon Dec 6, 2021
3982884
Make _Py_IsMainInterpreter inline again.
markshannon Dec 7, 2021
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
Prev Previous commit
Next Next commit
Ensure that FatalError is raised for NULL interpreter state in debug … 
…builds.
  • Loading branch information
@markshannon
markshannon committed Nov 1, 2021
commit 4b8335643fe7bf26f6d19f0ee85b4cbbb0e88eca
12 changes: 12 additions & 0 deletions Include/internal/pycore_pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,23 @@ _Py_EnsureFuncTstateNotNULL(const char *func, PyThreadState *tstate)
See also _PyInterpreterState_Get()
and _PyGILState_GetInterpreterStateUnsafe(). */
#ifdef _Py_THREAD_LOCAL
#ifdef Py_DEBUG
static inline PyInterpreterState* _PyInterpreterState_GET(void) {
PyInterpreterState *interp = _py_current_interpreter;
if (interp == NULL) {
Py_FatalError("no current interpreter");
}
return interp;
}
#else
#define _PyInterpreterState_GET() _py_current_interpreter
#endif
#else
static inline PyInterpreterState* _PyInterpreterState_GET(void) {
PyThreadState *tstate = _PyThreadState_GET();
#ifdef Py_DEBUG
_Py_EnsureTstateNotNULL(tstate);
#endif
PyInterpreterState *interp = tstate->interp;
if (interp == NULL) {
Py_FatalError("no current interpreter");
Expand Down