diff options
author | Eric Snow <ericsnowcurrently@gmail.com> | 2023-10-03 15:20:48 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-03 15:20:48 (GMT) |
commit | f5198b09e16bca1886f8245fa88203d07d51ec11 (patch) | |
tree | e2032653aee5b6e2df560f6a37eca5a957d1fb6f /Include/cpython | |
parent | 4227bfa8b273207a2b882f7d69c8ac49c3d2b57d (diff) | |
download | cpython-f5198b09e16bca1886f8245fa88203d07d51ec11.zip cpython-f5198b09e16bca1886f8245fa88203d07d51ec11.tar.gz cpython-f5198b09e16bca1886f8245fa88203d07d51ec11.tar.bz2 |
gh-109860: Use a New Thread State When Switching Interpreters, When Necessary (gh-110245)
In a few places we switch to another interpreter without knowing if it has a thread state associated with the current thread. For the main interpreter there wasn't much of a problem, but for subinterpreters we were *mostly* okay re-using the tstate created with the interpreter (located via PyInterpreterState_ThreadHead()). There was a good chance that tstate wasn't actually in use by another thread.
However, there are no guarantees of that. Furthermore, re-using an already used tstate is currently fragile. To address this, now we create a new thread state in each of those places and use it.
One consequence of this change is that PyInterpreterState_ThreadHead() may not return NULL (though that won't happen for the main interpreter).
Diffstat (limited to 'Include/cpython')
-rw-r--r-- | Include/cpython/pystate.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h index 7e4c57e..af5cc4a 100644 --- a/Include/cpython/pystate.h +++ b/Include/cpython/pystate.h @@ -92,6 +92,15 @@ struct _ts { /* padding to align to 4 bytes */ unsigned int :24; } _status; +#ifdef Py_BUILD_CORE +# define _PyThreadState_WHENCE_NOTSET -1 +# define _PyThreadState_WHENCE_UNKNOWN 0 +# define _PyThreadState_WHENCE_INTERP 1 +# define _PyThreadState_WHENCE_THREADING 2 +# define _PyThreadState_WHENCE_GILSTATE 3 +# define _PyThreadState_WHENCE_EXEC 4 +#endif + int _whence; int py_recursion_remaining; int py_recursion_limit; |