dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@ralph.lag.net-20051203043206-1a5ab28112642246] 

when closing an sftp file because of __del__, don't wait for a response, just shoot off a request and leave (on linux, the GC is run from a devoted thread)
This commit is contained in:
Robey Pointer 2005-12-02 20:32:06 -08:00
parent 62a83e7d03
commit a8778ffe6f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
paramiko/sftp_file.py
View File

@ -46,9 +46,9 @@ class SFTPFile (BufferedFile):
self._saved_exception = None self._saved_exception = None
def __del__(self): def __del__(self):
self.close() self.close(_async=True)
def close(self): def close(self, _async=False):
# We allow double-close without signaling an error, because real # We allow double-close without signaling an error, because real
# Python file objects do. However, we must protect against actually # Python file objects do. However, we must protect against actually
# sending multiple CMD_CLOSE packets, because after we close our # sending multiple CMD_CLOSE packets, because after we close our
@ -62,7 +62,11 @@ class SFTPFile (BufferedFile):
self.sftp._finish_responses(self) self.sftp._finish_responses(self)
BufferedFile.close(self) BufferedFile.close(self)
try: try:
self.sftp._request(CMD_CLOSE, self.handle) if _async:
# GC'd file handle could be called from an arbitrary thread -- don't wait for a response
self.sftp._async_request(type(None), CMD_CLOSE, self.handle)
else:
self.sftp._request(CMD_CLOSE, self.handle)
except EOFError: except EOFError:
# may have outlived the Transport connection # may have outlived the Transport connection
pass pass
@ -71,6 +75,7 @@ class SFTPFile (BufferedFile):
pass pass
def _read_prefetch(self, size): def _read_prefetch(self, size):
# while not closed, and haven't fetched past the current position, and haven't reached EOF...
while (self._prefetch_so_far <= self._realpos) and \ while (self._prefetch_so_far <= self._realpos) and \
(self._prefetch_so_far < self._prefetch_size) and not self._closed: (self._prefetch_so_far < self._prefetch_size) and not self._closed:
self.sftp._read_response() self.sftp._read_response()