X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python3%2Fashd%2Fserve.py;h=0927710ae7c7ac90c0411ffb45e6c48d8326d236;hp=e156cd608d10e08e1055be98dbac151786ebf9b5;hb=6e8b9b9d6d043ecbcaeb8ef807bd9648424aedd7;hpb=bcad6b0c48d516ddc920b52f06083ceaa242e1ca

diff --git a/python3/ashd/serve.py b/python3/ashd/serve.py
index e156cd6..0927710 100644
--- a/python3/ashd/serve.py
+++ b/python3/ashd/serve.py
@@ -75,8 +75,10 @@ class handler(object):
     def handle(self, request):
         raise Exception()
     def ckflush(self, req):
+        p = select.poll()
+        p.register(req, select.POLLOUT)
         while len(req.buffer) > 0:
-            rls, wls, els = select.select([], [req], [req])
+            p.poll()
             req.flush()
     def close(self):
         pass
@@ -207,7 +209,8 @@ class threadpool(handler):
         self.waitlimit = 5
         self.wlstart = 0.0
         self.qlk = threading.Lock()
-        self.qcond = threading.Condition(self.qlk)
+        self.qfcond = threading.Condition(self.qlk)
+        self.qecond = threading.Condition(self.qlk)
         self.max = max
         self.qsz = qsz
         self.timeout = timeout
@@ -229,15 +232,15 @@ class threadpool(handler):
             if self.timeout is not None:
                 now = start = time.time()
                 while len(self.queue) >= self.qsz:
-                    self.qcond.wait(start + self.timeout - now)
+                    self.qecond.wait(start + self.timeout - now)
                     now = time.time()
                     if now - start > self.timeout:
                         os.abort()
             else:
-                while len(self.current) >= self.qsz:
-                    self.qcond.wait()
+                while len(self.queue) >= self.qsz:
+                    self.qecond.wait()
             self.queue.append(req)
-            self.qcond.notify()
+            self.qfcond.notify()
             if len(self.waiting) < 1:
                 spawn = True
         if spawn:
@@ -283,13 +286,14 @@ class threadpool(handler):
                         try:
                             if len(self.waiting) == self.waitlimit:
                                 self.wlstart = now
-                            self.qcond.wait(start + timeout - now)
+                            self.qfcond.wait(start + timeout - now)
                         finally:
                             self.waiting.remove(th)
                         now = time.time()
                         if now - start > timeout:
                             return
                     req = self.queue.popleft()
+                    self.qecond.notify()
                 try:
                     self.handle1(req)
                 finally: