openstack/deb-python-eventlet
Code Issues Proposed changes

greenio: makefile related pypy socket ref counting

Browse Source 
On PyPy `[Errno 9] Bad file descriptor` because `makefile dup/_drop` dance leaves socket with PyPy special reference counter zero, so it may be garbage collected.

https://github.com/eventlet/eventlet/issues/318

(@temoto) maybe proper fix is to remove `dup` in `makefile()`.
This commit is contained in:
Yashwardhan Singh
2016-07-07 05:40:34 -07:00
committed by Sergey Shepelev
parent 6de8d478ca
commit 2ea3ad9c22
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eventlet/greenio/base.py
View File

@@ -299,6 +299,11 @@ class GreenSocket(object):
res = _python2_fileobject(dupped, *args, **kwargs) res = _python2_fileobject(dupped, *args, **kwargs)
if hasattr(dupped, "_drop"): if hasattr(dupped, "_drop"):
dupped._drop() dupped._drop()
# Making the close function of dupped None so that when garbage collector
# kicks in and tries to call del, which will ultimately call close, _drop
# doesn't get called on dupped twice as it has been already explicitly called in
# previous line
dupped.close = None
return res return res
def makeGreenFile(self, *args, **kw): def makeGreenFile(self, *args, **kw):