From 7910f8532f65960d7cc7de15bf17dd534a0df7a2 Mon Sep 17 00:00:00 2001 From: donovan Date: Sat, 17 May 2008 17:11:59 -0700 Subject: [PATCH] I broke the threadpool when I refactored it before --- eventlet/tpool.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eventlet/tpool.py b/eventlet/tpool.py index 31eeb4a..6717148 100644 --- a/eventlet/tpool.py +++ b/eventlet/tpool.py @@ -34,7 +34,8 @@ if not isinstance(_rfile, greenio.GreenPipe): def _signal_t2e(): - nwritten = greenio.__original_write__(_wpipe,' ') + from eventlet import util + nwritten = util.__original_write__(_wpipe,' ') _reqq = Queue(maxsize=-1) _rspq = Queue(maxsize=-1) @@ -42,7 +43,7 @@ _rspq = Queue(maxsize=-1) def tpool_trampoline(): global _reqq, _rspq while(True): - _c = _wrap_rfile.recv(1) + _c = _rfile.recv(1) assert(_c != "") while not _rspq.empty(): try: @@ -71,6 +72,7 @@ def tworker(): _rspq.put((e,rv)) _signal_t2e() + def erecv(e): rv = e.wait() if isinstance(rv,tuple) and len(rv) == 4 and isinstance(rv[0],Exception): @@ -81,6 +83,7 @@ def erecv(e): raise e return rv + def execute(meth,*args, **kwargs): """Execute method in a thread, blocking the current coroutine until the method completes.