gh-117657: Quiet TSAN warnings about remaining non-atomic accesses of…

… `tstate->state` (#118165) Quiet TSAN warnings about remaining non-atomic accesses of `tstate->state`
python · Apr 23, 2024 · 2e7771a · 2e7771a
1 parent 0d221e9
commit 2e7771a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Python/parking_lot.c b/Python/parking_lot.c
@@ -194,7 +194,8 @@ _PySemaphore_Wait(_PySemaphore *sema, PyTime_t timeout, int detach)
     PyThreadState *tstate = NULL;
     if (detach) {
         tstate = _PyThreadState_GET();
-        if (tstate && tstate->state == _Py_THREAD_ATTACHED) {
+        if (tstate && _Py_atomic_load_int_relaxed(&tstate->state) ==
+                          _Py_THREAD_ATTACHED) {
             // Only detach if we are attached
             PyEval_ReleaseThread(tstate);
         }

diff --git a/Python/pystate.c b/Python/pystate.c
@@ -2096,7 +2096,7 @@ _PyThreadState_Suspend(PyThreadState *tstate)
 {
     _PyRuntimeState *runtime = &_PyRuntime;
 
-    assert(tstate->state == _Py_THREAD_ATTACHED);
+    assert(_Py_atomic_load_int_relaxed(&tstate->state) == _Py_THREAD_ATTACHED);
 
     struct _stoptheworld_state *stw = NULL;
     HEAD_LOCK(runtime);