traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace all calls to acquire_lock() and release_lock() with acquire() 

and release() instead.
This commit is contained in:
Guido van Rossum 1998-04-29 14:29:32 +00:00
parent 268397f513
commit 7e6d18c1c0
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Lib/Queue.py
View File

@ -19,28 +19,28 @@ class Queue:
self._init(maxsize) self._init(maxsize)
self.mutex = thread.allocate_lock() self.mutex = thread.allocate_lock()
self.esema = thread.allocate_lock() self.esema = thread.allocate_lock()
self.esema.acquire_lock() self.esema.acquire()
self.fsema = thread.allocate_lock() self.fsema = thread.allocate_lock()
def qsize(self): def qsize(self):
"""Returns the approximate size of the queue (not reliable!).""" """Returns the approximate size of the queue (not reliable!)."""
self.mutex.acquire_lock() self.mutex.acquire()
n = self._qsize() n = self._qsize()
self.mutex.release_lock() self.mutex.release()
return n return n
def empty(self): def empty(self):
"""Returns 1 if the queue is empty, 0 otherwise (not reliable!).""" """Returns 1 if the queue is empty, 0 otherwise (not reliable!)."""
self.mutex.acquire_lock() self.mutex.acquire()
n = self._empty() n = self._empty()
self.mutex.release_lock() self.mutex.release()
return n return n
def full(self): def full(self):
"""Returns 1 if the queue is full, 0 otherwise (not reliable!).""" """Returns 1 if the queue is full, 0 otherwise (not reliable!)."""
self.mutex.acquire_lock() self.mutex.acquire()
n = self._full() n = self._full()
self.mutex.release_lock() self.mutex.release()
return n return n
def put(self, item): def put(self, item):
@ -48,30 +48,30 @@ class Queue:
If the queue is full, block until a free slot is avaiable. If the queue is full, block until a free slot is avaiable.
""" """
self.fsema.acquire_lock() self.fsema.acquire()
self.mutex.acquire_lock() self.mutex.acquire()
was_empty = self._empty() was_empty = self._empty()
self._put(item) self._put(item)
if was_empty: if was_empty:
self.esema.release_lock() self.esema.release()
if not self._full(): if not self._full():
self.fsema.release_lock() self.fsema.release()
self.mutex.release_lock() self.mutex.release()
def get(self): def get(self):
"""Gets and returns an item from the queue. """Gets and returns an item from the queue.
This method blocks if necessary until an item is available. This method blocks if necessary until an item is available.
""" """
self.esema.acquire_lock() self.esema.acquire()
self.mutex.acquire_lock() self.mutex.acquire()
was_full = self._full() was_full = self._full()
item = self._get() item = self._get()
if was_full: if was_full:
self.fsema.release_lock() self.fsema.release()
if not self._empty(): if not self._empty():
self.esema.release_lock() self.esema.release()
self.mutex.release_lock() self.mutex.release()
return item return item
# Get an item from the queue if one is immediately available, # Get an item from the queue if one is immediately available,
@ -83,27 +83,27 @@ class Queue:
this raises the Empty exception if the queue is empty or this raises the Empty exception if the queue is empty or
temporarily unavailable. temporarily unavailable.
""" """
locked = self.esema.acquire_lock(0) locked = self.esema.acquire(0)
self.mutex.acquire_lock() self.mutex.acquire()
if self._empty(): if self._empty():
# The queue is empty -- we can't have esema # The queue is empty -- we can't have esema
self.mutex.release_lock() self.mutex.release()
raise Empty raise Empty
if not locked: if not locked:
locked = self.esema.acquire_lock(0) locked = self.esema.acquire(0)
if not locked: if not locked:
# Somebody else has esema # Somebody else has esema
# but we have mutex -- # but we have mutex --
# go out of their way # go out of their way
self.mutex.release_lock() self.mutex.release()
raise Empty raise Empty
was_full = self._full() was_full = self._full()
item = self._get() item = self._get()
if was_full: if was_full:
self.fsema.release_lock() self.fsema.release()
if not self._empty(): if not self._empty():
self.esema.release_lock() self.esema.release()
self.mutex.release_lock() self.mutex.release()
return item return item
# XXX Need to define put_nowait() as well. # XXX Need to define put_nowait() as well.