Skip to content

Commit 1a33205

Browse files
committed
gh-134009: Expose PyMutex_IsLocked in the public C API
The `PyMutex_IsLocked()` function is useful in assertions for verifying that code maintains certain locking invariants.
1 parent b430e92 commit 1a33205

File tree

5 files changed

+32
-7
lines changed

5 files changed

+32
-7
lines changed

Doc/c-api/init.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,6 +2291,18 @@ The C-API provides a basic mutual exclusion lock.
22912291
22922292
.. versionadded:: 3.13
22932293
2294+
.. c:function:: int PyMutex_IsLocked(PyMutex *m)
2295+
2296+
Returns one if the mutex *m* is currently locked, zero otherwise.
2297+
2298+
.. note::
2299+
2300+
This function is intended for use in assertions and debugging only and
2301+
should not be used to make concurrency control decisions, as the lock
2302+
state may change immediately after the check.
2303+
2304+
.. versionadded:: 3.14
2305+
22942306
.. _python-critical-section-api:
22952307
22962308
Python Critical Section API

Include/cpython/lock.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ PyAPI_FUNC(void) PyMutex_Lock(PyMutex *m);
3636
// exported function for unlocking the mutex
3737
PyAPI_FUNC(void) PyMutex_Unlock(PyMutex *m);
3838

39+
// exported function for unlocking the mutex
40+
PyAPI_FUNC(int) PyMutex_IsLocked(PyMutex *m);
41+
3942
// Locks the mutex.
4043
//
4144
// If the mutex is currently locked, the calling thread will be parked until
@@ -61,3 +64,11 @@ _PyMutex_Unlock(PyMutex *m)
6164
}
6265
}
6366
#define PyMutex_Unlock _PyMutex_Unlock
67+
68+
// Checks if the mutex is currently locked.
69+
static inline int
70+
_PyMutex_IsLocked(PyMutex *m)
71+
{
72+
return (_Py_atomic_load_uint8(&m->_bits) & _Py_LOCKED) != 0;
73+
}
74+
#define PyMutex_IsLocked _PyMutex_IsLocked

Include/internal/pycore_lock.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ PyMutex_LockFast(PyMutex *m)
2525
return _Py_atomic_compare_exchange_uint8(lock_bits, &expected, _Py_LOCKED);
2626
}
2727

28-
// Checks if the mutex is currently locked.
29-
static inline int
30-
PyMutex_IsLocked(PyMutex *m)
31-
{
32-
return (_Py_atomic_load_uint8(&m->_bits) & _Py_LOCKED) != 0;
33-
}
34-
3528
// Re-initializes the mutex after a fork to the unlocked state.
3629
static inline void
3730
_PyMutex_at_fork_reinit(PyMutex *m)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Expose :c:func:`PyMutex_IsLocked` as part of the public C API.

Python/lock.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,3 +619,11 @@ PyMutex_Unlock(PyMutex *m)
619619
Py_FatalError("unlocking mutex that is not locked");
620620
}
621621
}
622+
623+
624+
#undef PyMutex_IsLocked
625+
int
626+
PyMutex_IsLocked(PyMutex *m)
627+
{
628+
return _PyMutex_IsLocked(m);
629+
}

0 commit comments

Comments
 (0)