Skip to content

Commit c39f9e8

Browse files
committed
Just use _Py_atomic_exchange_ptr instead of FT macro
1 parent d03da86 commit c39f9e8

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

Include/internal/pycore_pyatomic_ft_wrappers.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ extern "C" {
4040
_Py_atomic_store_ssize_relaxed(&value, new_value)
4141
#define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) \
4242
_Py_atomic_store_uint8_relaxed(&value, new_value)
43-
#define FT_ATOMIC_EXCHANGE_PYOBJECT(value, new_value) \
44-
_Py_atomic_exchange_ptr(&value, new_value)
4543

4644
#else
4745
#define FT_ATOMIC_LOAD_PTR(value) value
@@ -55,16 +53,6 @@ extern "C" {
5553
#define FT_ATOMIC_STORE_UINTPTR_RELEASE(value, new_value) value = new_value
5654
#define FT_ATOMIC_STORE_SSIZE_RELAXED(value, new_value) value = new_value
5755
#define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) value = new_value
58-
#define FT_ATOMIC_EXCHANGE_PYOBJECT(value, new_value) \
59-
_atomic_exchange_pyobject_withgil(&value, new_value)
60-
61-
static inline PyObject *
62-
_atomic_exchange_pyobject_withgil(PyObject **src, PyObject *new_value)
63-
{
64-
PyObject *res = *src;
65-
*src = new_value;
66-
return res;
67-
}
6856

6957
#endif
7058

Python/instrumentation.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,9 +1374,8 @@ _PyMonitoring_RegisterCallback(int tool_id, int event_id, PyObject *obj)
13741374
PyInterpreterState *is = _PyInterpreterState_GET();
13751375
assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS);
13761376
assert(0 <= event_id && event_id < _PY_MONITORING_EVENTS);
1377-
PyObject *callback = FT_ATOMIC_EXCHANGE_PYOBJECT(is->monitoring_callables[tool_id][event_id],
1378-
Py_XNewRef(obj)
1379-
);
1377+
PyObject *callback = _Py_atomic_exchange_ptr(&is->monitoring_callables[tool_id][event_id],
1378+
Py_XNewRef(obj));
13801379

13811380
return callback;
13821381
}

0 commit comments

Comments
 (0)