X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python3%2Fashd%2Fasync.py;h=4247bd6e6f47ed4486b4a3c895ba2e7d0aae69d6;hp=02c75a92a9175a61e3f257e05c866be93e305631;hb=be6ec4ec06b2f394a58aa652a22a300fae371994;hpb=940f9c467d2f2c923468109c529c4902d95f5b9c

diff --git a/python3/ashd/async.py b/python3/ashd/async.py
index 02c75a9..4247bd6 100644
--- a/python3/ashd/async.py
+++ b/python3/ashd/async.py
@@ -8,6 +8,7 @@ class epoller(object):
         self.lock = threading.RLock()
         self.ep = None
         self.th = None
+        self.stopped = False
         self._daemon = True
 
     @staticmethod
@@ -38,6 +39,14 @@ class epoller(object):
         except Exception as exc:
             self.exception(ch, *sys.exc_info())
 
+    def _closeall(self):
+        with self.lock:
+            while self.registered:
+                fd, (ch, evs) = next(iter(self.registered.items()))
+                del self.registered[fd]
+                self.ep.unregister(fd)
+                self._cb(ch, "close")
+
     def _run(self):
         ep = select.epoll()
         try:
@@ -47,6 +56,9 @@ class epoller(object):
                 self.ep = ep
 
             while self.registered:
+                if self.stopped:
+                    self._closeall()
+                    break
                 try:
                     evlist = ep.poll(10)
                 except IOError as exc:
@@ -139,15 +151,39 @@ class epoller(object):
                 if self.ep:
                     self.ep.modify(fd, evs)
 
+    def stop(self):
+        if threading.current_thread() == self.th:
+            self.stopped = True
+        else:
+            def tgt():
+                self.stopped = True
+            cb = callbuffer()
+            cb.call(tgt)
+            cb.stop()
+            self.add(cb)
+
 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()
@@ -188,8 +224,9 @@ class sockbuffer(object):
             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()
@@ -239,3 +276,10 @@ class callbuffer(object):
             if self.wp >= 0:
                 os.close(self.wp)
                 self.wp = -1
+
+def currentwatcher(io, current):
+    def run():
+        while current:
+            current.wait()
+        io.stop()
+    threading.Thread(target=run, name="Current watcher").start()