Skip to content

gh-103323: Get the "Current" Thread State from a Thread-Local Variable #103324

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
ericsnowcurrently merged 12 commits into from
Apr 24, 2023
Merged

gh-103323: Get the "Current" Thread State from a Thread-Local Variable #103324

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c4db85a
Add a thread_local macro.
ericsnowcurrently Jan 10, 2023
47a7094
tstate_current -> thread_local.
ericsnowcurrently Apr 6, 2023
cf22de1
Add _PyThraedState_GetCurrent().
ericsnowcurrently Apr 7, 2023
d4136d2
Add HAVE_THREAD_LOCAL.
ericsnowcurrently Apr 7, 2023
f8c6598
Support the faster approach, if available.
ericsnowcurrently Apr 7, 2023
9496df0
Do not fail if thread_local not supported.
ericsnowcurrently Apr 7, 2023
2c335a3
thread_local -> _Py_thread_local
ericsnowcurrently Apr 7, 2023
4af0ce7
Only define _Py_thread_local for the core runtime.
ericsnowcurrently Apr 7, 2023
3db4007
Fix pystate.c.
ericsnowcurrently Apr 7, 2023
d573053
Call _PyThreadState_GET() from _PyRuntimeState_GetThreadState().
ericsnowcurrently Apr 7, 2023
feb8ef5
Fix the error message.
ericsnowcurrently Apr 7, 2023
2332a2e
Add a NEWS entry.
ericsnowcurrently Apr 7, 2023
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
Only define _Py_thread_local for the core runtime.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 7, 2023
commit 4af0ce7e8d06831a72d39566ca8b02093fe6ec05
32 changes: 17 additions & 15 deletions Include/pyport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,21 +664,23 @@ extern char * _getpty(int *, int, mode_t, int);
#endif

#ifdef WITH_THREAD
Copy link
Copy Markdown
Member

@vstinner vstinner May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is useless. This macro is now always defined. It's only kept for backward compatibility.

Copy link
Copy Markdown
Member Author

@ericsnowcurrently ericsnowcurrently May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't it affect WASM builds?

Copy link
Copy Markdown
Member

@vstinner vstinner May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the code 3 lines above:

#ifndef WITH_THREAD
#  define WITH_THREAD
#endif

# ifdef HAVE_THREAD_LOCAL
# error "unexpectedly, HAVE_THREAD_LOCAL is already defined"
# endif
# define HAVE_THREAD_LOCAL 1
# ifdef thread_local
# define _Py_thread_local thread_local
# elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
# define _Py_thread_local _Thread_local
# elif defined(_MSC_VER) /* AKA NT_THREADS */
# define _Py_thread_local __declspec(thread)
# elif defined(__GNUC__) /* includes clang */
# define _Py_thread_local __thread
# else
// fall back to the PyThread_tss_*() API, or ignore.
# undef HAVE_THREAD_LOCAL
# ifdef Py_BUILD_CORE
# ifdef HAVE_THREAD_LOCAL
# error "unexpectedly, HAVE_THREAD_LOCAL is already defined"
# endif
# define HAVE_THREAD_LOCAL 1
# ifdef thread_local
# define _Py_thread_local thread_local
# elif __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
# define _Py_thread_local _Thread_local
# elif defined(_MSC_VER) /* AKA NT_THREADS */
# define _Py_thread_local __declspec(thread)
# elif defined(__GNUC__) /* includes clang */
# define _Py_thread_local __thread
# else
// fall back to the PyThread_tss_*() API, or ignore.
# undef HAVE_THREAD_LOCAL
# endif
# endif
#endif

Expand Down