mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
gh-133146: Add the old public get_value method to documentation and refactor code. (GH-133301)
also uses it within the internals in a few places.
This commit is contained in:
parent
f2ca1581ca
commit
db098a475a
3 changed files with 20 additions and 5 deletions
|
|
@ -1577,12 +1577,22 @@ object -- see :ref:`multiprocessing-managers`.
|
||||||
A solitary difference from its close analog exists: its ``acquire`` method's
|
A solitary difference from its close analog exists: its ``acquire`` method's
|
||||||
first argument is named *block*, as is consistent with :meth:`Lock.acquire`.
|
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()
|
.. method:: locked()
|
||||||
|
|
||||||
Return a boolean indicating whether this object is locked right now.
|
Return a boolean indicating whether this object is locked right now.
|
||||||
|
|
||||||
.. versionadded:: 3.14
|
.. versionadded:: 3.14
|
||||||
|
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
On macOS, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with
|
On macOS, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ def get(self, block=True, timeout=None):
|
||||||
|
|
||||||
def qsize(self):
|
def qsize(self):
|
||||||
# Raises NotImplementedError on Mac OSX because of broken sem_getvalue()
|
# 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):
|
def empty(self):
|
||||||
return not self._poll()
|
return not self._poll()
|
||||||
|
|
|
||||||
|
|
@ -135,11 +135,16 @@ def __init__(self, value=1, *, ctx):
|
||||||
SemLock.__init__(self, SEMAPHORE, value, SEM_VALUE_MAX, ctx=ctx)
|
SemLock.__init__(self, SEMAPHORE, value, SEM_VALUE_MAX, ctx=ctx)
|
||||||
|
|
||||||
def get_value(self):
|
def get_value(self):
|
||||||
|
'''Returns current value of Semaphore.
|
||||||
|
|
||||||
|
Raises NotImplementedError on Mac OSX
|
||||||
|
because of broken sem_getvalue().
|
||||||
|
'''
|
||||||
return self._semlock._get_value()
|
return self._semlock._get_value()
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
try:
|
try:
|
||||||
value = self._semlock._get_value()
|
value = self.get_value()
|
||||||
except Exception:
|
except Exception:
|
||||||
value = 'unknown'
|
value = 'unknown'
|
||||||
return '<%s(value=%s)>' % (self.__class__.__name__, value)
|
return '<%s(value=%s)>' % (self.__class__.__name__, value)
|
||||||
|
|
@ -155,7 +160,7 @@ def __init__(self, value=1, *, ctx):
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
try:
|
try:
|
||||||
value = self._semlock._get_value()
|
value = self.get_value()
|
||||||
except Exception:
|
except Exception:
|
||||||
value = 'unknown'
|
value = 'unknown'
|
||||||
return '<%s(value=%s, maxvalue=%s)>' % \
|
return '<%s(value=%s, maxvalue=%s)>' % \
|
||||||
|
|
@ -247,8 +252,8 @@ def _make_methods(self):
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
try:
|
try:
|
||||||
num_waiters = (self._sleeping_count._semlock._get_value() -
|
num_waiters = (self._sleeping_count.get_value() -
|
||||||
self._woken_count._semlock._get_value())
|
self._woken_count.get_value())
|
||||||
except Exception:
|
except Exception:
|
||||||
num_waiters = 'unknown'
|
num_waiters = 'unknown'
|
||||||
return '<%s(%s, %s)>' % (self.__class__.__name__, self._lock, num_waiters)
|
return '<%s(%s, %s)>' % (self.__class__.__name__, self._lock, num_waiters)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue