signed long race

Author: dpdani

Include/cpython/pyatomic.h

@@ -333,6 +333,9 @@ _Py_atomic_load_short_relaxed(const short *obj);
 static inline unsigned short
 _Py_atomic_load_ushort_relaxed(const unsigned short *obj);
 
+static inline long
+_Py_atomic_load_long_relaxed(const long *obj);
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj);
 
@@ -508,6 +511,9 @@ _Py_atomic_store_ushort_release(unsigned short *obj, unsigned short value);
 static inline void
 _Py_atomic_store_uint_release(unsigned int *obj, unsigned int value);
 
+static inline void
+_Py_atomic_store_long_release(long *obj, long value);
+
 static inline int
 _Py_atomic_load_int_acquire(const int *obj);
 

Include/cpython/pyatomic_gcc.h

@@ -322,6 +322,10 @@ static inline unsigned short
 _Py_atomic_load_ushort_relaxed(const unsigned short *obj)
 { return __atomic_load_n(obj, __ATOMIC_RELAXED); }
 
+static inline long
+_Py_atomic_load_long_relaxed(const long *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj)
 { return __atomic_load_n(obj, __ATOMIC_RELAXED); }
@@ -544,6 +548,10 @@ static inline void
 _Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
 { __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
 
+static inline void
+_Py_atomic_store_long_release(long *obj, long value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 { __atomic_store_n(obj, value, __ATOMIC_RELEASE); }

Include/cpython/pyatomic_msc.h

@@ -658,6 +658,12 @@ _Py_atomic_load_ushort_relaxed(const unsigned short *obj)
     return *(volatile unsigned short *)obj;
 }
 
+static inline long
+_Py_atomic_load_long_relaxed(const long *obj)
+{
+    return *(volatile long *)obj;
+}
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj)
 {
@@ -1053,6 +1059,19 @@ _Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
 #endif
 }
 
+static inline void
+_Py_atomic_store_long_release(long *obj, long value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(long volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int64);
+    __stlr64((unsigned __int64 volatile *)obj, (unsigned __int64)value);
+#else
+#  error "no implementation of _Py_atomic_store_long_release"
+#endif
+}
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 {

Include/cpython/pyatomic_std.h

@@ -547,6 +547,14 @@ _Py_atomic_load_ushort_relaxed(const unsigned short *obj)
                                 memory_order_relaxed);
 }
 
+static inline long
+_Py_atomic_load_long_relaxed(const long *obj)
+{
+    _Py_USING_STD;
+    return atomic_load_explicit((const _Atomic(long)*)obj,
+                                memory_order_relaxed);
+}
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj)
 {
@@ -967,6 +975,14 @@ _Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
                           memory_order_release);
 }
 
+static inline void
+_Py_atomic_store_long_release(long *obj, long value)
+{
+    _Py_USING_STD;
+    atomic_store_explicit((_Atomic(long)*)obj, value,
+                          memory_order_release);
+}
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 {

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -85,6 +85,10 @@ extern "C" {
     _Py_atomic_store_uint_release(&value, new_value)
 #define FT_ATOMIC_LOAD_UINT_RELAXED(value) \
     _Py_atomic_load_uint_relaxed(&value)
+#define FT_ATOMIC_STORE_LONG_RELEASE(value, new_value) \
+    _Py_atomic_store_long_release(&value, new_value)
+#define FT_ATOMIC_LOAD_LONG_RELAXED(value) \
+    _Py_atomic_load_long_relaxed(&value)
 
 #else
 #define FT_ATOMIC_LOAD_PTR(value) value
@@ -120,6 +124,8 @@ extern "C" {
 #define FT_ATOMIC_STORE_INT_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_LOAD_UINT_RELAXED(value) value
 #define FT_ATOMIC_STORE_UINT_RELEASE(value, new_value) value = new_value
+#define FT_ATOMIC_LOAD_LONG_RELAXED(value) value
+#define FT_ATOMIC_STORE_LONG_RELEASE(value, new_value) value = new_value
 
 #endif
 

Python/structmember.c

@@ -55,7 +55,7 @@ PyMember_GetOne(const char *obj_addr, PyMemberDef *l)
         v = PyLong_FromUnsignedLong(FT_ATOMIC_LOAD_UINT_RELAXED(*(unsigned int*)addr));
         break;
     case Py_T_LONG:
-        v = PyLong_FromLong(*(long*)addr);
+        v = PyLong_FromLong(FT_ATOMIC_LOAD_LONG_RELAXED(*(long*)addr));
         break;
     case Py_T_ULONG:
         v = PyLong_FromUnsignedLong(*(unsigned long*)addr);
@@ -251,7 +251,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
         break;
     }
     case Py_T_LONG:{
-        *(long*)addr = PyLong_AsLong(v);
+        FT_ATOMIC_STORE_LONG_RELEASE(*(long*)addr, PyLong_AsLong(v));
         if ((*(long*)addr == -1) && PyErr_Occurred())
             return -1;
         break;