openstack/deb-python-eventlet
Code Issues Proposed changes

I broke the threadpool when I refactored it before

Browse Source
This commit is contained in:
donovan
2008-05-17 17:11:59 -07:00
parent fe8034e864
commit 7910f8532f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eventlet/tpool.py
View File

@@ -34,7 +34,8 @@ if not isinstance(_rfile, greenio.GreenPipe):
def _signal_t2e(): def _signal_t2e():
nwritten = greenio.__original_write__(_wpipe,' ') from eventlet import util
nwritten = util.__original_write__(_wpipe,' ')
_reqq = Queue(maxsize=-1) _reqq = Queue(maxsize=-1)
_rspq = Queue(maxsize=-1) _rspq = Queue(maxsize=-1)
@@ -42,7 +43,7 @@ _rspq = Queue(maxsize=-1)
def tpool_trampoline(): def tpool_trampoline():
global _reqq, _rspq global _reqq, _rspq
while(True): while(True):
_c = _wrap_rfile.recv(1) _c = _rfile.recv(1)
assert(_c != "") assert(_c != "")
while not _rspq.empty(): while not _rspq.empty():
try: try:
@@ -71,6 +72,7 @@ def tworker():
_rspq.put((e,rv)) _rspq.put((e,rv))
_signal_t2e() _signal_t2e()
def erecv(e): def erecv(e):
rv = e.wait() rv = e.wait()
if isinstance(rv,tuple) and len(rv) == 4 and isinstance(rv[0],Exception): if isinstance(rv,tuple) and len(rv) == 4 and isinstance(rv[0],Exception):
@@ -81,6 +83,7 @@ def erecv(e):
raise e raise e
return rv return rv
def execute(meth,*args, **kwargs): def execute(meth,*args, **kwargs):
"""Execute method in a thread, blocking the current """Execute method in a thread, blocking the current
coroutine until the method completes. coroutine until the method completes.