HEAD_LOCK change to INTERP_THREAD_LOCK

Author: rruuaanng

Python/pystate.c

@@ -791,17 +791,17 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
     }
 
     // Clear the current/main thread state last.
-    HEAD_LOCK(runtime);
-    PyThreadState *p = interp->threads.head;
-    HEAD_UNLOCK(runtime);
+    INTERP_THREAD_LOCK(interp);
+    PyThreadState *p = PyInterpreterState_ThreadHead(interp);
+    INTERP_THREAD_UNLOCK(interp);
     while (p != NULL) {
         // See https://github.com/python/cpython/issues/102126
         // Must be called without HEAD_LOCK held as it can deadlock
         // if any finalizer tries to acquire that lock.
         PyThreadState_Clear(p);
-        HEAD_LOCK(runtime);
+        INTERP_THREAD_LOCK(interp);
         p = p->next;
-        HEAD_UNLOCK(runtime);
+        INTERP_THREAD_UNLOCK(interp);
     }
     if (tstate->interp == interp) {
         /* We fix tstate->_status below when we for sure aren't using it
@@ -1854,10 +1854,10 @@ _PyThreadState_RemoveExcept(PyThreadState *tstate)
     assert(runtime->stoptheworld.world_stopped);
 #endif
 
-    HEAD_LOCK(runtime);
+    INTERP_THREAD_LOCK(interp);
     /* Remove all thread states, except tstate, from the linked list of
        thread states. */
-    PyThreadState *list = interp->threads.head;
+    PyThreadState *list = PyInterpreterState_ThreadHead(interp);
     if (list == tstate) {
         list = tstate->next;
     }
@@ -1869,7 +1869,7 @@ _PyThreadState_RemoveExcept(PyThreadState *tstate)
     }
     tstate->prev = tstate->next = NULL;
     interp->threads.head = tstate;
-    HEAD_UNLOCK(runtime);
+    INTERP_THREAD_UNLOCK(interp);
 
     return list;
 }
@@ -2345,8 +2345,9 @@ PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc)
      * list of thread states we're traversing, so to prevent that we lock
      * head_mutex for the duration.
      */
-    HEAD_LOCK(runtime);
-    for (PyThreadState *tstate = interp->threads.head; tstate != NULL; tstate = tstate->next) {
+    INTERP_THREAD_LOCK(interp);
+    PyThreadState *list = PyInterpreterState_ThreadHead(interp);
+    for (PyThreadState *tstate = list; tstate != NULL; tstate = tstate->next) {
         if (tstate->thread_id != id) {
             continue;
         }
@@ -2360,13 +2361,13 @@ PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc)
          */
         Py_XINCREF(exc);
         PyObject *old_exc = _Py_atomic_exchange_ptr(&tstate->async_exc, exc);
-        HEAD_UNLOCK(runtime);
+        INTERP_THREAD_UNLOCK(interp);
 
         Py_XDECREF(old_exc);
         _Py_set_eval_breaker_bit(tstate, _PY_ASYNC_EXCEPTION_BIT);
         return 1;
     }
-    HEAD_UNLOCK(runtime);
+    INTERP_THREAD_UNLOCK(interp);
     return 0;
 }