Commit 1ddf95c0 authored by Amos Latteier's avatar Amos Latteier

fixed typos and added support for module names and trigger callbacks.

parent 51f1dfd4
...@@ -4,7 +4,7 @@ from ZServerPublisher import ZServerPublisher ...@@ -4,7 +4,7 @@ from ZServerPublisher import ZServerPublisher
class ZRendevous: class ZRendevous:
def __init__(self, n=1, name='Main'): def __init__(self, n=1):
sync=thread.allocate_lock() sync=thread.allocate_lock()
self._a=sync.acquire self._a=sync.acquire
self._r=sync.release self._r=sync.release
...@@ -17,7 +17,7 @@ class ZRendevous: ...@@ -17,7 +17,7 @@ class ZRendevous:
l.acquire() l.acquire()
pool.append(l) pool.append(l)
thread.start_new_thread(ZServerPublisher, thread.start_new_thread(ZServerPublisher,
(name, self.accept,)) (self.accept,))
n=n-1 n=n-1
finally: self._r() finally: self._r()
...@@ -34,17 +34,17 @@ class ZRendevous: ...@@ -34,17 +34,17 @@ class ZRendevous:
self._a() self._a()
pool.append(l) pool.append(l)
r=self.requests[0] r=requests[0]
del self.requets[0] del requests[0]
return r return r
finally: self._r() finally: self._r()
def handle(self, environ, input): def handle(self, name, environ, input, callback):
output=OutputPipe() output=OutputPipe(callback)
self._a() self._a()
try: try:
pool, requests, ready = self._lists pool, requests, ready = self._lists
requests.append((input, output, environ)) requests.append((name, input, output, environ))
if ready: if ready:
l=ready[-1] l=ready[-1]
del ready[-1] del ready[-1]
......
...@@ -4,7 +4,7 @@ from ZServerPublisher import ZServerPublisher ...@@ -4,7 +4,7 @@ from ZServerPublisher import ZServerPublisher
class ZRendevous: class ZRendevous:
def __init__(self, n=1, name='Main'): def __init__(self, n=1):
sync=thread.allocate_lock() sync=thread.allocate_lock()
self._a=sync.acquire self._a=sync.acquire
self._r=sync.release self._r=sync.release
...@@ -17,7 +17,7 @@ class ZRendevous: ...@@ -17,7 +17,7 @@ class ZRendevous:
l.acquire() l.acquire()
pool.append(l) pool.append(l)
thread.start_new_thread(ZServerPublisher, thread.start_new_thread(ZServerPublisher,
(name, self.accept,)) (self.accept,))
n=n-1 n=n-1
finally: self._r() finally: self._r()
...@@ -34,17 +34,17 @@ class ZRendevous: ...@@ -34,17 +34,17 @@ class ZRendevous:
self._a() self._a()
pool.append(l) pool.append(l)
r=self.requests[0] r=requests[0]
del self.requets[0] del requests[0]
return r return r
finally: self._r() finally: self._r()
def handle(self, environ, input): def handle(self, name, environ, input, callback):
output=OutputPipe() output=OutputPipe(callback)
self._a() self._a()
try: try:
pool, requests, ready = self._lists pool, requests, ready = self._lists
requests.append((input, output, environ)) requests.append((name, input, output, environ))
if ready: if ready:
l=ready[-1] l=ready[-1]
del ready[-1] del ready[-1]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment