Skip to content

gh-81057: Move Threading-Related Globals to _PyRuntimeState #100084

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 8 commits into from
Dec 9, 2022
Merged

gh-81057: Move Threading-Related Globals to _PyRuntimeState #100084

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e7ea36
Add pycore_pythread.h.
ericsnowcurrently Dec 6, 2022
9616123
Add PyThread__init_thread():lib_initialized.
ericsnowcurrently Dec 8, 2022
09fc557
Move thread.c:initialized to _PyRuntimeState.
ericsnowcurrently Dec 8, 2022
649062a
Move some macros into pycore_pythread.h.
ericsnowcurrently Dec 8, 2022
0a5106c
Move condattr_monotonic to _PyRuntimeState.
ericsnowcurrently Dec 8, 2022
9d7feb7
Move init_condattr():ca to _PyRuntimeState.
ericsnowcurrently Dec 8, 2022
f606c66
Move py_tls_entries to _PyRuntimeState.
ericsnowcurrently Dec 6, 2022
3c22543
Clarify the macro.
ericsnowcurrently Dec 8, 2022
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
Move thread.c:initialized to _PyRuntimeState.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Dec 9, 2022
commit 09fc5578f81417bb0b7d6d88c811bd8f1d7429ca
2 changes: 1 addition & 1 deletion Include/internal/pycore_pythread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern "C" {


struct _pythread_runtime_state {
int _not_used;
int initialized;
};


Expand Down
7 changes: 4 additions & 3 deletions Python/thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@

#endif /* _POSIX_THREADS */

static int initialized;

static void PyThread__init_thread(void); /* Forward */

#define initialized _PyRuntime.threads.initialized

void
PyThread_init_thread(void)
{
if (initialized)
if (initialized) {
return;
}
initialized = 1;
PyThread__init_thread();
}
Expand Down
3 changes: 2 additions & 1 deletion Python/thread_nt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,12 @@ unsigned long PyThread_get_thread_native_id(void);
#endif

/*
* Initialization of the C package, should not be needed.
* Initialization for the current runtime.
*/
static void
PyThread__init_thread(void)
{
// Initialization of the C package should not be needed.
}

/*
Expand Down
2 changes: 1 addition & 1 deletion Python/thread_pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ typedef struct {
"%s: %s\n", name, strerror(status)); error = 1; }

/*
* Initialization.
* Initialization for the current runtime.
*/
static void
PyThread__init_thread(void)
Expand Down
1 change: 0 additions & 1 deletion Tools/c-analyzer/cpython/ignored.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Python/fileutils.c set_inheritable ioctl_works -
Modules/posixmodule.c os_dup2_impl dup3_works -

## guards around resource init
Python/thread.c - initialized -
Python/thread_pthread.h PyThread__init_thread lib_initialized -
Python/thread_pthread.h - condattr_monotonic -
# static buffer used during one-time initialization
Expand Down