Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Doc/library/multiprocessing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1577,12 +1577,22 @@ object -- see :ref:`multiprocessing-managers`.
A solitary difference from its close analog exists: its ``acquire`` method's
first argument is named *block*, as is consistent with :meth:`Lock.acquire`.


.. method:: get_value()

Return the current value of semaphore.

Note that this may raise :exc:`NotImplementedError` on platforms like
macOS where ``sem_getvalue()`` is not implemented.


.. method:: locked()

Return a boolean indicating whether this object is locked right now.

.. versionadded:: 3.14


.. note::

On macOS, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with
Expand Down
2 changes: 1 addition & 1 deletion Lib/multiprocessing/queues.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def get(self, block=True, timeout=None):

def qsize(self):
# Raises NotImplementedError on Mac OSX because of broken sem_getvalue()
return self._maxsize - self._sem._semlock._get_value()
return self._maxsize - self._sem.get_value()

def empty(self):
return not self._poll()
Expand Down
13 changes: 9 additions & 4 deletions Lib/multiprocessing/synchronize.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,16 @@ def __init__(self, value=1, *, ctx):
SemLock.__init__(self, SEMAPHORE, value, SEM_VALUE_MAX, ctx=ctx)

def get_value(self):
'''Returns current value of Semaphore.

Raises NotImplementedError on Mac OSX
because of broken sem_getvalue().
'''
return self._semlock._get_value()

def __repr__(self):
try:
value = self._semlock._get_value()
value = self.get_value()
except Exception:
value = 'unknown'
return '<%s(value=%s)>' % (self.__class__.__name__, value)
Expand All @@ -155,7 +160,7 @@ def __init__(self, value=1, *, ctx):

def __repr__(self):
try:
value = self._semlock._get_value()
value = self.get_value()
except Exception:
value = 'unknown'
return '<%s(value=%s, maxvalue=%s)>' % \
Expand Down Expand Up @@ -247,8 +252,8 @@ def _make_methods(self):

def __repr__(self):
try:
num_waiters = (self._sleeping_count._semlock._get_value() -
self._woken_count._semlock._get_value())
num_waiters = (self._sleeping_count.get_value() -
self._woken_count.get_value())
except Exception:
num_waiters = 'unknown'
return '<%s(%s, %s)>' % (self.__class__.__name__, self._lock, num_waiters)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Minor refactoring of :mod:`multiprocessing.synchronize` and :mod:`multiprocessing.queues` to use
the public :meth:`~multiprocessing.Semaphore.get_value` method instead of private attribute access.
Loading