issue #249: whoops, fix new poller timeouts.
This commit is contained in:
parent
aa8f786413
commit
dcf0aa351e
|
@ -1063,7 +1063,6 @@ class Latch(object):
|
||||||
def get(self, timeout=None, block=True):
|
def get(self, timeout=None, block=True):
|
||||||
_vv and IOLOG.debug('%r.get(timeout=%r, block=%r)',
|
_vv and IOLOG.debug('%r.get(timeout=%r, block=%r)',
|
||||||
self, timeout, block)
|
self, timeout, block)
|
||||||
|
|
||||||
self._lock.acquire()
|
self._lock.acquire()
|
||||||
try:
|
try:
|
||||||
if self.closed:
|
if self.closed:
|
||||||
|
|
|
@ -561,7 +561,7 @@ class KqueuePoller(Poller):
|
||||||
self._control(fd, select.KQ_FILTER_WRITE, select.KQ_EV_DELETE)
|
self._control(fd, select.KQ_FILTER_WRITE, select.KQ_EV_DELETE)
|
||||||
del self._wfds[fd]
|
del self._wfds[fd]
|
||||||
|
|
||||||
def poll(self, broker, timeout=None):
|
def poll(self, timeout=None):
|
||||||
changelist = self._changelist
|
changelist = self._changelist
|
||||||
self._changelist = []
|
self._changelist = []
|
||||||
events, _ = mitogen.core.io_op(self._kqueue.control,
|
events, _ = mitogen.core.io_op(self._kqueue.control,
|
||||||
|
@ -633,7 +633,7 @@ class EpollPoller(Poller):
|
||||||
self._wfds.pop(fd, None)
|
self._wfds.pop(fd, None)
|
||||||
self._control(fd)
|
self._control(fd)
|
||||||
|
|
||||||
def poll(self, broker, timeout=None):
|
def poll(self, timeout=None):
|
||||||
the_timeout = -1
|
the_timeout = -1
|
||||||
if timeout is not None:
|
if timeout is not None:
|
||||||
the_timeout = timeout
|
the_timeout = timeout
|
||||||
|
|
Loading…
Reference in New Issue