added Queue subclass where put_nowait honors mutex lock, and that can be flushed
This commit is contained in:
24
bstrd/prodqueue.py
Normal file
24
bstrd/prodqueue.py
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
from queue import Queue, Full
|
||||||
|
|
||||||
|
|
||||||
|
class ProdQueue(Queue):
|
||||||
|
|
||||||
|
def put_nowait(self, *args, **kwargs):
|
||||||
|
if self.mutex.locked():
|
||||||
|
raise Locked
|
||||||
|
|
||||||
|
super().put_nowait(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
def clear(self):
|
||||||
|
with self.mutex:
|
||||||
|
self.queue.clear()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class Locked(Exception):
|
||||||
|
"Exception raised by ProdQueue.put_nowait() if mutex is locked."
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
import signal
|
import signal
|
||||||
|
|
||||||
from threading import Thread, Event
|
from threading import Thread, Event
|
||||||
from queue import Queue, Full
|
from .prodqueue import ProdQueue, Full, Locked
|
||||||
|
|
||||||
|
|
||||||
def prepend_signal(sig, func):
|
def prepend_signal(sig, func):
|
||||||
@ -38,7 +38,7 @@ class ProdThread:
|
|||||||
self.func = func
|
self.func = func
|
||||||
|
|
||||||
self.thread = None
|
self.thread = None
|
||||||
self.queue = Queue(maxsize=maxsize)
|
self.queue = ProdQueue(maxsize=maxsize)
|
||||||
self.get = self.queue.get
|
self.get = self.queue.get
|
||||||
|
|
||||||
self.running = Event()
|
self.running = Event()
|
||||||
@ -58,7 +58,7 @@ class ProdThread:
|
|||||||
for data in gen:
|
for data in gen:
|
||||||
try:
|
try:
|
||||||
self.queue.put_nowait(data)
|
self.queue.put_nowait(data)
|
||||||
except Full:
|
except (Full, Locked):
|
||||||
pass
|
pass
|
||||||
self.running.clear()
|
self.running.clear()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user