HEAD_LOCK change to INTERP_THREAD_LOCK

Author: rruuaanng

Python/pystate.c

@@ -791,9 +791,9 @@ 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
@@ -1518,7 +1518,7 @@ new_threadstate(PyInterpreterState *interp, int whence)
 #endif
 
     /* We serialize concurrent creation to protect global state. */
-    HEAD_LOCK(runtime);
+    INTERP_THREAD_LOCK(interp);
 
     interp->threads.next_unique_id += 1;
     uint64_t id = interp->threads.next_unique_id;
@@ -1546,7 +1546,7 @@ new_threadstate(PyInterpreterState *interp, int whence)
     init_threadstate(tstate, interp, id, whence);
     add_threadstate(interp, (PyThreadState *)tstate, old_head);
 
-    HEAD_UNLOCK(runtime);
+    INTERP_THREAD_UNLOCK(interp);
     if (!used_newtstate) {
         // Must be called with lock unlocked to avoid re-entrancy deadlock.
         PyMem_RawFree(new_tstate);
@@ -1737,7 +1737,7 @@ tstate_delete_common(PyThreadState *tstate, int release_gil)
         Py_FatalError("NULL interpreter");
     }
     _PyRuntimeState *runtime = interp->runtime;
-
+// hello
     HEAD_LOCK(runtime);
     if (tstate->prev) {
         tstate->prev->next = tstate->next;
@@ -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;
         }
@@ -2366,7 +2367,7 @@ PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc)
         _Py_set_eval_breaker_bit(tstate, _PY_ASYNC_EXCEPTION_BIT);
         return 1;
     }
-    HEAD_UNLOCK(runtime);
+    INTERP_THREAD_UNLOCK(interp);
     return 0;
 }