openstack/deb-python-eventlet
Code Issues Proposed changes

fix: with twisted hub socket instances had too many referrers that caused socket not to close after greenlet exit

Browse Source
This commit is contained in:
Denis Bilenko
2008-10-30 02:15:20 +06:00
parent dba32d7c95
commit bb228f4171
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eventlet/api.py
View File

@@ -149,7 +149,13 @@ def trampoline(fd, read=None, write=None, timeout=None, timeout_exc=TimeoutError
if t is not None:
t.cancel()
hub.remove_descriptor(descriptor)
greenlib.switch(self, fd)
greenlib.switch(self)
# with TwistedHub, descriptor 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 be 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:
t = hub.schedule_call(timeout, _do_timeout)
descriptor = hub.add_descriptor(fileno, read and cb, write and cb, _do_close)