class epoller(object):
exc_handler = None
- def __init__(self):
+ def __init__(self, check=None):
self.registered = {}
+ self.fdcache = {}
self.lock = threading.RLock()
self.ep = None
self.th = None
self.stopped = False
+ self.loopcheck = set()
+ if check is not None:
+ self.loopcheck.add(check)
self._daemon = True
@staticmethod
def exception(self, ch, *exc):
self.remove(ch)
if self.exc_handler is None:
- traceback.print_exception(exc)
+ traceback.print_exception(*exc)
else:
self.exc_handler(ch, *exc)
ep = select.epoll()
try:
with self.lock:
- for fd, (ob, evs) in self.registered.items():
- ep.register(fd, evs)
+ try:
+ for fd, (ob, evs) in self.registered.items():
+ ep.register(fd, evs)
+ except:
+ self.registered.clear()
+ raise
self.ep = ep
while self.registered:
+ for ck in self.loopcheck:
+ ck(self)
if self.stopped:
self._closeall()
break
if fd in self.registered:
nevs = self._evsfor(ch)
if nevs == 0:
+ del self.fdcache[ch]
del self.registered[fd]
ep.unregister(fd)
self._cb(ch, "close")
ch.close()
return
ch.watcher = self
+ self.fdcache[ch] = fd
self.registered[fd] = (ch, evs)
if self.ep:
self.ep.register(fd, evs)
def remove(self, ch, ignore=False):
with self.lock:
- fd = ch.fileno()
- if fd not in self.registered:
+ try:
+ fd = self.fdcache[ch]
+ except KeyError:
if ignore:
return
raise KeyError("fd %i is not registered" % fd)
pch, cevs = self.registered[fd]
if pch is not ch:
raise ValueError("fd %i registered via object %r, cannot remove with %r" % (pch, ch))
+ del self.fdcache[ch]
del self.registered[fd]
if self.ep:
self.ep.unregister(fd)
def update(self, ch, ignore=False):
with self.lock:
- fd = ch.fileno()
- if fd not in self.registered:
+ try:
+ fd = self.fdcache[ch]
+ except KeyError:
if ignore:
return
raise KeyError("fd %i is not registered" % fd)
raise ValueError("fd %i registered via object %r, cannot update with %r" % (pch, ch))
evs = self._evsfor(ch)
if evs == 0:
+ del self.fdcache[ch]
del self.registered[fd]
if self.ep:
self.ep.unregister(fd)
def watcher():
return epoller()
-class sockbuffer(object):
- def __init__(self, sk):
- self.sk = sk
+class channel(object):
+ readable = False
+ writable = False
+
+ def __init__(self):
+ self.watcher = None
+
+ def fileno(self):
+ raise NotImplementedError("fileno()")
+
+ def close(self):
+ pass
+
+class sockbuffer(channel):
+ def __init__(self, socket, **kwargs):
+ super().__init__(**kwargs)
+ self.sk = socket
self.eof = False
self.obuf = bytearray()
- self.watcher = None
def fileno(self):
return self.sk.fileno()
self.obuf[:] = b""
self.eof = True
-class callbuffer(object):
- def __init__(self):
+class callbuffer(channel):
+ def __init__(self, **kwargs):
+ super().__init__(**kwargs)
self.queue = []
self.rp, self.wp = os.pipe()
self.lock = threading.Lock()
self.wp = -1
def currentwatcher(io, current):
- def run():
- while current:
- current.wait()
- io.stop()
- threading.Thread(target=run, name="Current watcher").start()
+ def check(io):
+ if not current:
+ io.stop()
+ io.loopcheck.add(check)