Move py_tls_entries to _PyRuntimeState.

Author: ericsnowcurrently

Include/internal/pycore_pythread.h

@@ -46,8 +46,17 @@ extern "C" {
 #endif
 
 
+#if defined(HAVE_PTHREAD_STUBS)
+// pthread_key
+struct py_stub_tls_entry {
+    bool in_use;
+    void *value;
+};
+#endif
+
 struct _pythread_runtime_state {
     int initialized;
+
 #ifdef _USE_PTHREADS
     // This matches when thread_pthread.h is used.
     struct {
@@ -60,6 +69,12 @@ struct _pythread_runtime_state {
     } _condattr_monotonic;
 
 #endif  // USE_PTHREADS
+
+#if defined(HAVE_PTHREAD_STUBS)
+    struct {
+        struct py_stub_tls_entry tls_entries[PTHREAD_KEYS_MAX];
+    } stub;
+#endif
 };
 
 

Python/thread_pthread_stubs.h

@@ -124,13 +124,10 @@ pthread_attr_destroy(pthread_attr_t *attr)
     return 0;
 }
 
-// pthread_key
-typedef struct {
-    bool in_use;
-    void *value;
-} py_tls_entry;
 
-static py_tls_entry py_tls_entries[PTHREAD_KEYS_MAX] = {0};
+typedef struct py_stub_tls_entry py_tls_entry;
+
+#define py_tls_entries (_PyRuntime.threads.stub.tls_entries)
 
 int
 pthread_key_create(pthread_key_t *key, void (*destr_function)(void *))

Tools/c-analyzer/cpython/globals-to-fix.tsv

@@ -317,7 +317,6 @@ Python/perf_trampoline.c	-	perf_status	-
 Python/perf_trampoline.c	-	extra_code_index	-
 Python/perf_trampoline.c	-	code_arena	-
 Python/perf_trampoline.c	-	trampoline_api	-
-Python/thread_pthread_stubs.h	-	py_tls_entries	-
 
 
 ##################################