Move tracemalloc_reentrant_key to _PyRuntimeState.

Author: ericsnowcurrently

Include/internal/pycore_tracemalloc.h

@@ -64,12 +64,14 @@ struct tracemalloc_traceback {
 
 struct _tracemalloc_runtime_state {
     struct _PyTraceMalloc_Config config;
+
     /* Protected by the GIL */
     struct {
         PyMemAllocatorEx mem;
         PyMemAllocatorEx raw;
         PyMemAllocatorEx obj;
     } allocators;
+
 #if defined(TRACE_RAW_MALLOC)
     PyThread_type_lock tables_lock;
 #endif
@@ -96,6 +98,8 @@ struct _tracemalloc_runtime_state {
     /* domain (unsigned int) => traces (_Py_hashtable_t).
        Protected by TABLES_LOCK(). */
     _Py_hashtable_t *domains;
+
+    Py_tss_t reentrant_key;
 };
 
 #define _tracemalloc_runtime_state_INIT \
@@ -105,6 +109,7 @@ struct _tracemalloc_runtime_state {
             .tracing = 0, \
             .max_nframe = 1, \
         }, \
+        .reentrant_key = Py_tss_NEEDS_INIT, \
     }
 
 

Modules/_tracemalloc.c

@@ -102,7 +102,7 @@ tracemalloc_error(const char *format, ...)
 #if defined(TRACE_RAW_MALLOC)
 #define REENTRANT_THREADLOCAL
 
-static Py_tss_t tracemalloc_reentrant_key = Py_tss_NEEDS_INIT;
+#define tracemalloc_reentrant_key _PyRuntime.tracemalloc.reentrant_key
 
 /* Any non-NULL pointer can be used */
 #define REENTRANT Py_True

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

@@ -378,7 +378,6 @@ Modules/faulthandler.c	-	old_stack	-
 ## state
 
 Modules/_tracemalloc.c	-	tracemalloc_empty_traceback	-
-Modules/_tracemalloc.c	-	tracemalloc_reentrant_key	-
 Modules/faulthandler.c	faulthandler_dump_traceback	reentrant	-
 Modules/signalmodule.c	-	is_tripped	-
 Modules/signalmodule.c	-	signal_global_state	-