Get the GIL in Untrack

Author: vstinner

Python/tracemalloc.c

@@ -1256,12 +1256,13 @@ PyTraceMalloc_Track(unsigned int domain, uintptr_t ptr,
                     size_t size)
 {
     PyGILState_STATE gil_state = PyGILState_Ensure();
+    int result;
+
     // gh-129185: Check before TABLES_LOCK() to support calls after
     // _PyTraceMalloc_Fini().
-    int result;
     if (!tracemalloc_config.tracing) {
         result = -2;
-        goto unlock_gil;
+        goto done;
     }
 
     TABLES_LOCK();
@@ -1275,7 +1276,7 @@ PyTraceMalloc_Track(unsigned int domain, uintptr_t ptr,
     }
 
     TABLES_UNLOCK();
-unlock_gil:
+done:
     PyGILState_Release(gil_state);
 
     return result;
@@ -1285,16 +1286,19 @@ PyTraceMalloc_Track(unsigned int domain, uintptr_t ptr,
 int
 PyTraceMalloc_Untrack(unsigned int domain, uintptr_t ptr)
 {
+    // Need the GIL to prevent races on the first 'tracing' test
+    PyGILState_STATE gil_state = PyGILState_Ensure();
+    int result;
+
     // gh-129185: Check before TABLES_LOCK() to support calls after
-    // _PyTraceMalloc_Fini(). This check is prone to race if another thread
-    // calls _PyTraceMalloc_Fini() in parallel.
+    // _PyTraceMalloc_Fini()
     if (!tracemalloc_config.tracing) {
-        return -2;
+        result = -2;
+        goto done;
     }
 
     TABLES_LOCK();
 
-    int result;
     if (tracemalloc_config.tracing) {
         tracemalloc_remove_trace_unlocked(domain, ptr);
         result = 0;
@@ -1305,6 +1309,8 @@ PyTraceMalloc_Untrack(unsigned int domain, uintptr_t ptr)
     }
 
     TABLES_UNLOCK();
+done:
+    PyGILState_Release(gil_state);
     return result;
 }