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

diff --git a/python3/ashd/async.py b/python3/ashd/async.py
index 4247bd6..aa52af9 100644
--- a/python3/ashd/async.py
+++ b/python3/ashd/async.py
@@ -3,12 +3,15 @@ import sys, os, errno, threading, select, traceback
 class epoller(object):
     exc_handler = None
 
-    def __init__(self):
+    def __init__(self, check=None):
         self.registered = {}
         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
@@ -26,7 +29,7 @@ class epoller(object):
     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)
 
@@ -51,11 +54,17 @@ class epoller(object):
         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
@@ -278,8 +287,7 @@ class callbuffer(channel):
                 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)