Refactor no-gil structs and update test

Author: markshannon

Include/internal/pycore_index_pool.h

@@ -13,32 +13,12 @@ extern "C" {
 
 #ifdef Py_GIL_DISABLED
 
+#include "pycore_interp_structs.h"
+
 // This contains code for allocating unique indices in an array. It is used by
 // the free-threaded build to assign each thread a globally unique index into
 // each code object's thread-local bytecode array.
 
-// A min-heap of indices
-typedef struct _PyIndexHeap {
-    int32_t *values;
-
-    // Number of items stored in values
-    Py_ssize_t size;
-
-    // Maximum number of items that can be stored in values
-    Py_ssize_t capacity;
-} _PyIndexHeap;
-
-// An unbounded pool of indices. Indices are allocated starting from 0. They
-// may be released back to the pool once they are no longer in use.
-typedef struct _PyIndexPool {
-    PyMutex mutex;
-
-    // Min heap of indices available for allocation
-    _PyIndexHeap free_indices;
-
-    // Next index to allocate if no free indices are available
-    int32_t next_index;
-} _PyIndexPool;
 
 // Allocate the smallest available index. Returns -1 on error.
 extern int32_t _PyIndexPool_AllocIndex(_PyIndexPool *indices);

Include/internal/pycore_interp.h

@@ -43,12 +43,6 @@ extern "C" {
 
 
 
-#ifdef Py_GIL_DISABLED
-// This should be prime but otherwise the choice is arbitrary. A larger value
-// increases concurrency at the expense of memory.
-#  define NUM_WEAKREF_LIST_LOCKS 127
-#endif
-
 /* interpreter state */
 
 #define _PyInterpreterState_WHENCE_NOTSET -1

Include/internal/pycore_interp_structs.h

@@ -19,6 +19,12 @@ extern "C" {
 #define TYPE_MAX_WATCHERS 8
 
 
+#ifdef Py_GIL_DISABLED
+// This should be prime but otherwise the choice is arbitrary. A larger value
+// increases concurrency at the expense of memory.
+#  define NUM_WEAKREF_LIST_LOCKS 127
+#endif
+
 typedef int (*_Py_pending_call_func)(void *);
 
 struct _pending_call {
@@ -697,6 +703,56 @@ struct _Py_interp_static_objects {
 
 #include "pycore_instruments.h"
 
+
+#ifdef Py_GIL_DISABLED
+
+// A min-heap of indices
+typedef struct _PyIndexHeap {
+    int32_t *values;
+
+    // Number of items stored in values
+    Py_ssize_t size;
+
+    // Maximum number of items that can be stored in values
+    Py_ssize_t capacity;
+} _PyIndexHeap;
+
+// An unbounded pool of indices. Indices are allocated starting from 0. They
+// may be released back to the pool once they are no longer in use.
+typedef struct _PyIndexPool {
+    PyMutex mutex;
+
+    // Min heap of indices available for allocation
+    _PyIndexHeap free_indices;
+
+    // Next index to allocate if no free indices are available
+    int32_t next_index;
+} _PyIndexPool;
+
+typedef union _Py_unique_id_entry {
+    // Points to the next free type id, when part of the freelist
+    union _Py_unique_id_entry *next;
+
+    // Stores the object when the id is assigned
+    PyObject *obj;
+} _Py_unique_id_entry;
+
+struct _Py_unique_id_pool {
+    PyMutex mutex;
+
+    // combined table of object with allocated unique ids and unallocated ids.
+    _Py_unique_id_entry *table;
+
+    // Next entry to allocate inside 'table' or NULL
+    _Py_unique_id_entry *freelist;
+
+    // size of 'table'
+    Py_ssize_t size;
+};
+
+#endif
+
+
 /* PyInterpreterState holds the global state for one of the runtime's
    interpreters.  Typically the initial (main) interpreter is the only one.
 

Include/internal/pycore_uniqueid.h

@@ -24,26 +24,6 @@ extern "C" {
 // Each entry implicitly represents a unique id based on its offset in the
 // table. Non-allocated entries form a free-list via the 'next' pointer.
 // Allocated entries store the corresponding PyObject.
-typedef union _Py_unique_id_entry {
-    // Points to the next free type id, when part of the freelist
-    union _Py_unique_id_entry *next;
-
-    // Stores the object when the id is assigned
-    PyObject *obj;
-} _Py_unique_id_entry;
-
-struct _Py_unique_id_pool {
-    PyMutex mutex;
-
-    // combined table of object with allocated unique ids and unallocated ids.
-    _Py_unique_id_entry *table;
-
-    // Next entry to allocate inside 'table' or NULL
-    _Py_unique_id_entry *freelist;
-
-    // size of 'table'
-    Py_ssize_t size;
-};
 
 #define _Py_INVALID_UNIQUE_ID 0