Test switchThread()

python · Sep 28, 2024 · 7fa925b · 7fa925b
1 parent 60a43e9
commit 7fa925b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Include/cpython/pyatomic_msc.h b/Include/cpython/pyatomic_msc.h
@@ -14,6 +14,7 @@
 #endif
 
 #include <intrin.h>
+#include <windows.h>
 
 #define _Py_atomic_ASSERT_ARG_TYPE(TYPE) \
     Py_BUILD_ASSERT(sizeof(*obj) == sizeof(TYPE))
@@ -315,6 +316,7 @@ _Py_atomic_exchange_int64(int64_t *obj, int64_t value)
         if (_Py_atomic_compare_exchange_int64(obj, &old_value, value)) {
             return old_value;
         }
+        SwitchToThread();
     }
 #endif
 }
@@ -431,6 +433,7 @@ _Py_atomic_and_uint64(uint64_t *obj, uint64_t value)
         if (_Py_atomic_compare_exchange_uint64(obj, &old_value, new_value)) {
             return old_value;
         }
+        SwitchToThread();
     }
 #endif
 }
@@ -486,6 +489,7 @@ _Py_atomic_or_uint64(uint64_t *obj, uint64_t value)
         if (_Py_atomic_compare_exchange_uint64(obj, &old_value, new_value)) {
             return old_value;
         }
+        SwitchToThread();
     }
 #endif
 }

diff --git a/Include/internal/pycore_cell.h b/Include/internal/pycore_cell.h
@@ -48,7 +48,6 @@ _PyStackRef _PyCell_GetStackRef(PyCellObject *cell)
 {
     PyObject *value;
 #ifdef Py_GIL_DISABLED
-    _Py_atomic_fence_acquire();
     value = _Py_atomic_load_ptr(&cell->ob_ref);
     if (value != NULL) {
         if (_Py_IsImmortal(value) || _PyObject_HasDeferredRefcount(value)) {
@@ -58,7 +57,6 @@ _PyStackRef _PyCell_GetStackRef(PyCellObject *cell)
             return _PyStackRef_FromPyObjectSteal(value);
         }
     }
-    _Py_atomic_fence_release();
 #endif
     value = PyCell_GetRef(cell);
     if (value == NULL) {

diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -16,6 +16,11 @@ extern "C" {
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #include "pycore_typeid.h"        // _PyType_IncrefSlow
 
+#ifdef MS_WINDOWS
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>            // SwitchToThread()
+#endif
+
 #define _Py_IMMORTAL_REFCNT_LOOSE ((_Py_IMMORTAL_REFCNT >> 1) + 1)
 
 // This value is added to `ob_ref_shared` for objects that use deferred
@@ -127,6 +132,14 @@ extern void _Py_DecRefTotal(PyThreadState *);
     interp->object_state.reftotal--
 #endif
 
+static inline void _SwitchThread(void)
+{
+#ifdef MS_WINDOWS
+    SwitchToThread();
+#endif
+    return;
+}
+
 // Increment reference count by n
 static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n)
 {
@@ -549,6 +562,7 @@ _Py_TryIncRefShared(PyObject *op)
             _Py_INCREF_STAT_INC();
             return 1;
         }
+        _SwitchThread();
     }
 }
 
@@ -583,6 +597,7 @@ _Py_XGetRef(PyObject **ptr)
         if (_Py_TryIncrefCompare(ptr, value)) {
             return value;
         }
+        _SwitchThread();
     }
 }
 
@@ -625,6 +640,7 @@ _Py_NewRefWithLock(PyObject *op)
                 new_shared)) {
             return op;
         }
+        _SwitchThread();
     }
 }
 
@@ -653,6 +669,7 @@ _PyObject_SetMaybeWeakref(PyObject *op)
                 &op->ob_ref_shared, &shared, shared | _Py_REF_MAYBE_WEAKREF)) {
             return;
         }
+        _SwitchThread();
     }
 }