Add locks around the loop

pablogsal · pablogsal · commit 3e4013591351 · 2022-08-04T16:30:17.000+01:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -98,6 +98,10 @@
 #define _Py_atomic_load_relaxed_int32(ATOMIC_VAL) _Py_atomic_load_relaxed(ATOMIC_VAL)
 #endif
 
+#define HEAD_LOCK(runtime) \
+    PyThread_acquire_lock((runtime)->interpreters.mutex, WAIT_LOCK)
+#define HEAD_UNLOCK(runtime) \
+    PyThread_release_lock((runtime)->interpreters.mutex)
 
 /* Forward declarations */
 static PyObject *trace_call_function(
@@ -7038,12 +7042,19 @@ PyEval_SetProfileAllThreads(Py_tracefunc func, PyObject *arg)
 {
     PyThreadState *this_tstate = _PyThreadState_GET();
     PyInterpreterState* interp = this_tstate->interp;
+
+    _PyRuntimeState *runtime = &_PyRuntime;
+    HEAD_LOCK(runtime);
     PyThreadState* ts = PyInterpreterState_ThreadHead(interp);
+    HEAD_UNLOCK(runtime);
+
     while (ts) {
         if (_PyEval_SetProfile(ts, func, arg) < 0) {
             _PyErr_WriteUnraisableMsg("in PyEval_SetProfileAllThreads", NULL);
         }
+        HEAD_LOCK(runtime);
         ts = PyThreadState_Next(ts);
+        HEAD_UNLOCK(runtime);
     }
 }
 
@@ -7105,12 +7116,19 @@ PyEval_SetTraceAllThreads(Py_tracefunc func, PyObject *arg)
 {
     PyThreadState *this_tstate = _PyThreadState_GET();
     PyInterpreterState* interp = this_tstate->interp;
+
+    _PyRuntimeState *runtime = &_PyRuntime;
+    HEAD_LOCK(runtime);
     PyThreadState* ts = PyInterpreterState_ThreadHead(interp);
+    HEAD_UNLOCK(runtime);
+
     while (ts) {
         if (_PyEval_SetTrace(ts, func, arg) < 0) {
             _PyErr_WriteUnraisableMsg("in PyEval_SetTraceAllThreads", NULL);
         }
+        HEAD_LOCK(runtime);
         ts = PyThreadState_Next(ts);
+        HEAD_UNLOCK(runtime);
     }
 }
 
