openstack/deb-python-eventlet
Code Issues Proposed changes

revert the bug introduced by 785

Browse Source 
the patch made the code do something different (pass descriptor to current.switch
instead of throwing it away)
This commit is contained in:
Denis Bilenko
2009-06-15 17:45:29 +07:00
parent a5d3ad4be6
commit c6678018b8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eventlet/api.py
View File

@@ -146,10 +146,18 @@ def trampoline(fd, read=None, write=None, timeout=None, timeout_exc=TimeoutError
current.throw(socket.error(32, 'Broken pipe')) current.throw(socket.error(32, 'Broken pipe'))
else: else:
current.throw(getattr(error, 'value', error)) # XXX convert to socket.error current.throw(getattr(error, 'value', error)) # XXX convert to socket.error
def cb(d):
current.switch()
# with TwistedHub, descriptor is actually an object (socket_rwdescriptor) which stores
# this callback. If this callback stores a reference to the socket instance (fd)
# then descriptor has a reference to that instance. This makes socket not collected
# after greenlet exit. Since nobody actually uses the results of this switch, I removed
# fd from here. If it will be needed than an indirect reference which is discarded right
# after the switch above should be used.
if timeout is not None: if timeout is not None:
t = hub.schedule_call(timeout, current.throw, timeout_exc) t = hub.schedule_call(timeout, current.throw, timeout_exc)
try: try:
descriptor = hub.add_descriptor(fileno, read and current.switch, write and current.switch, _do_close) descriptor = hub.add_descriptor(fileno, read and cb, write and cb, _do_close)
try: try:
return hub.switch() return hub.switch()
finally: finally: