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

Speed up the write operation by bulk calling read. 

Bulk check the ACKs from the server every 32MB
(or every write request). This way you gain speed
but also making sure not to get the error too late
in a large transfer.
This works for smaller files too, since there is a
cleanup routine being called when the file has been transfered.
This commit is contained in:
Olle Lundberg 2013-03-01 18:09:28 +01:00 committed by Jeff Forcier
parent dd7edd8ec8
commit bd1a97a045
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
paramiko/sftp_file.py
View File

@ -21,6 +21,7 @@ L{SFTPFile}
""" """
from binascii import hexlify from binascii import hexlify
from collections import deque
import socket import socket
import threading import threading
import time import time
@ -54,6 +55,7 @@ class SFTPFile (BufferedFile):
self._prefetch_data = {} self._prefetch_data = {}
self._prefetch_reads = [] self._prefetch_reads = []
self._saved_exception = None self._saved_exception = None
self._reqs = deque()
def __del__(self): def __del__(self):
self._close(async=True) self._close(async=True)
@ -163,12 +165,14 @@ class SFTPFile (BufferedFile):
def _write(self, data): def _write(self, data):
# may write less than requested if it would exceed max packet size # may write less than requested if it would exceed max packet size
chunk = min(len(data), self.MAX_REQUEST_SIZE) chunk = min(len(data), self.MAX_REQUEST_SIZE)
req = self.sftp._async_request(type(None), CMD_WRITE, self.handle, long(self._realpos), str(data[:chunk])) self._reqs.append(self.sftp._async_request(type(None), CMD_WRITE, self.handle, long(self._realpos), str(data[:chunk])))
if not self.pipelined or self.sftp.sock.recv_ready(): if not self.pipelined or (len(self._reqs) > 100 and self.sftp.sock.recv_ready()):
t, msg = self.sftp._read_response(req) while len(self._reqs):
if t != CMD_STATUS: req = self._reqs.popleft()
raise SFTPError('Expected status') t, msg = self.sftp._read_response(req)
# convert_status already called if t != CMD_STATUS:
raise SFTPError('Expected status')
# convert_status already called
return chunk return chunk
def settimeout(self, timeout): def settimeout(self, timeout):