Move autoTSSkey out of _PyRuntimeState.gilstate.

ericsnowcurrently · ericsnowcurrently · commit 4af2ecbe2e28 · 2023-01-19T08:38:58.000-07:00
diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
@@ -46,7 +46,6 @@ struct _gilstate_runtime_state {
     */
     /* TODO: Given interp_main, it may be possible to kill this ref */
     PyInterpreterState *autoInterpreterState;
-    Py_tss_t autoTSSkey;
 };
 
 /* Runtime audit hook state */
@@ -124,6 +123,8 @@ typedef struct pyruntimestate {
     /* Assuming the current thread holds the GIL, this is the
        PyThreadState for the current thread. */
     _Py_atomic_address tstate_current;
+    /* Used for the thread state bound to the current thread. */
+    Py_tss_t autoTSSkey;
 
     PyWideStringList orig_argv;
 
diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h
@@ -33,6 +33,9 @@ extern "C" {
               until _PyInterpreterState_Enable() is called. */ \
             .next_id = -1, \
         }, \
+        /* A TSS key must be initialized with Py_tss_NEEDS_INIT \
+           in accordance with the specification. */ \
+        .autoTSSkey = Py_tss_NEEDS_INIT, \
         .parser = _parser_runtime_state_INIT, \
         .imports = { \
             .lock = { \
@@ -49,9 +52,6 @@ extern "C" {
         }, \
         .gilstate = { \
             .check_enabled = 1, \
-            /* A TSS key must be initialized with Py_tss_NEEDS_INIT \
-               in accordance with the specification. */ \
-            .autoTSSkey = Py_tss_NEEDS_INIT, \
         }, \
         .dtoa = _dtoa_runtime_state_INIT(runtime), \
         .fileutils = { \
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -70,14 +70,14 @@ current_fast_clear(_PyRuntimeState *runtime)
 static int
 current_tss_initialized(_PyRuntimeState *runtime)
 {
-    return PyThread_tss_is_created(&runtime->gilstate.autoTSSkey);
+    return PyThread_tss_is_created(&runtime->autoTSSkey);
 }
 
 static PyStatus
 current_tss_init(_PyRuntimeState *runtime)
 {
     assert(!current_tss_initialized(runtime));
-    if (PyThread_tss_create(&runtime->gilstate.autoTSSkey) != 0) {
+    if (PyThread_tss_create(&runtime->autoTSSkey) != 0) {
         return _PyStatus_NO_MEMORY();
     }
     return _PyStatus_OK();
@@ -87,22 +87,22 @@ static void
 current_tss_fini(_PyRuntimeState *runtime)
 {
     assert(current_tss_initialized(runtime));
-    PyThread_tss_delete(&runtime->gilstate.autoTSSkey);
+    PyThread_tss_delete(&runtime->autoTSSkey);
 }
 
 static inline PyThreadState *
 current_tss_get(_PyRuntimeState *runtime)
 {
     assert(current_tss_initialized(runtime));
-    return (PyThreadState *)PyThread_tss_get(&runtime->gilstate.autoTSSkey);
+    return (PyThreadState *)PyThread_tss_get(&runtime->autoTSSkey);
 }
 
 static inline int
 _current_tss_set(_PyRuntimeState *runtime, PyThreadState *tstate)
 {
     assert(tstate != NULL);
     assert(current_tss_initialized(runtime));
-    return PyThread_tss_set(&runtime->gilstate.autoTSSkey, (void *)tstate);
+    return PyThread_tss_set(&runtime->autoTSSkey, (void *)tstate);
 }
 static inline void
 current_tss_set(_PyRuntimeState *runtime, PyThreadState *tstate)
@@ -116,7 +116,7 @@ static inline void
 current_tss_clear(_PyRuntimeState *runtime)
 {
     assert(current_tss_initialized(runtime));
-    if (PyThread_tss_set(&runtime->gilstate.autoTSSkey, NULL) != 0) {
+    if (PyThread_tss_set(&runtime->autoTSSkey, NULL) != 0) {
         Py_FatalError("failed to clear current tstate (TSS)");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,14 +70,14 @@ current_fast_clear(_PyRuntimeState *runtime)`
`70`	`70`	`static int`
`71`	`71`	`current_tss_initialized(_PyRuntimeState *runtime)`
`72`	`72`	`{`
`73`		`- return PyThread_tss_is_created(&runtime->gilstate.autoTSSkey);`
	`73`	`+ return PyThread_tss_is_created(&runtime->autoTSSkey);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`static PyStatus`
`77`	`77`	`current_tss_init(_PyRuntimeState *runtime)`
`78`	`78`	`{`
`79`	`79`	`assert(!current_tss_initialized(runtime));`
`80`		`- if (PyThread_tss_create(&runtime->gilstate.autoTSSkey) != 0) {`
	`80`	`+ if (PyThread_tss_create(&runtime->autoTSSkey) != 0) {`
`81`	`81`	`return _PyStatus_NO_MEMORY();`
`82`	`82`	`}`
`83`	`83`	`return _PyStatus_OK();`
`@@ -87,22 +87,22 @@ static void`
`87`	`87`	`current_tss_fini(_PyRuntimeState *runtime)`
`88`	`88`	`{`
`89`	`89`	`assert(current_tss_initialized(runtime));`
`90`		`- PyThread_tss_delete(&runtime->gilstate.autoTSSkey);`
	`90`	`+ PyThread_tss_delete(&runtime->autoTSSkey);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`static inline PyThreadState *`
`94`	`94`	`current_tss_get(_PyRuntimeState *runtime)`
`95`	`95`	`{`
`96`	`96`	`assert(current_tss_initialized(runtime));`
`97`		`- return (PyThreadState *)PyThread_tss_get(&runtime->gilstate.autoTSSkey);`
	`97`	`+ return (PyThreadState *)PyThread_tss_get(&runtime->autoTSSkey);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`static inline int`
`101`	`101`	`_current_tss_set(_PyRuntimeState runtime, PyThreadState tstate)`
`102`	`102`	`{`
`103`	`103`	`assert(tstate != NULL);`
`104`	`104`	`assert(current_tss_initialized(runtime));`
`105`		`- return PyThread_tss_set(&runtime->gilstate.autoTSSkey, (void *)tstate);`
	`105`	`+ return PyThread_tss_set(&runtime->autoTSSkey, (void *)tstate);`
`106`	`106`	`}`
`107`	`107`	`static inline void`
`108`	`108`	`current_tss_set(_PyRuntimeState runtime, PyThreadState tstate)`
`@@ -116,7 +116,7 @@ static inline void`
`116`	`116`	`current_tss_clear(_PyRuntimeState *runtime)`
`117`	`117`	`{`
`118`	`118`	`assert(current_tss_initialized(runtime));`
`119`		`- if (PyThread_tss_set(&runtime->gilstate.autoTSSkey, NULL) != 0) {`
	`119`	`+ if (PyThread_tss_set(&runtime->autoTSSkey, NULL) != 0) {`
`120`	`120`	`Py_FatalError("failed to clear current tstate (TSS)");`
`121`	`121`	`}`
`122`	`122`	`}`