X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python3%2Fashd%2Fserve.py;fp=python3%2Fashd%2Fserve.py;h=db68a5f6c4ab2cf509a874cacde0ec7343ef9078;hp=ce17b9d2b8b1e93b14e583e2d31d57dfe3f55507;hb=76ff6c4dcf0bed028475ef646f4d637d8e91d1a7;hpb=9c38d6e8568186c47103a9980235595b1962c081 diff --git a/python3/ashd/serve.py b/python3/ashd/serve.py index ce17b9d..db68a5f 100644 --- a/python3/ashd/serve.py +++ b/python3/ashd/serve.py @@ -108,6 +108,16 @@ class single(handler): finally: req.close() +def dbg(*a): + f = True + for o in a: + if not f: + sys.stderr.write(" ") + sys.stderr.write(str(a)) + f = False + sys.stderr.write("\n") + sys.stderr.flush() + class freethread(handler): cname = "free" @@ -142,15 +152,17 @@ class freethread(handler): while len(self.current) >= self.max: self.tcond.wait() th = reqthread(target=self.run, args=[req]) + th.registered = False th.start() - while th.is_alive() and th not in self.current: - self.tcond.wait(1) + while not th.registered: + self.tcond.wait() def run(self, req): try: th = threading.current_thread() with self.lk: self.current.add(th) + th.registered = True self.tcond.notify_all() try: env = req.mkenv() @@ -212,15 +224,17 @@ class resplex(handler): while len(self.current) >= self.max: self.tcond.wait() th = reqthread(target=self.handle1, args=[req]) + th.registered = False th.start() - while th.is_alive() and th not in self.current: - self.tcond.wait(1) + while not th.registered: + self.tcond.wait() def handle1(self, req): try: th = threading.current_thread() with self.lk: self.current.add(th) + th.registered = True self.tcond.notify_all() try: env = req.mkenv()