Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

http://bugs.python.org/issue6117 

Fix O(n**2) performance problem in socket._fileobject
This commit is contained in:
Kristján Valur Jónsson 2009-06-02 13:14:08 +00:00
parent d57b5543e4
commit 36c3928fdc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/socket.py
View File

@ -235,7 +235,7 @@ class _fileobject(object):
__slots__ = ["mode", "bufsize", "softspace", __slots__ = ["mode", "bufsize", "softspace",
# "closed" is a property, see below # "closed" is a property, see below
"_sock", "_rbufsize", "_wbufsize", "_rbuf", "_wbuf", "_sock", "_rbufsize", "_wbufsize", "_rbuf", "_wbuf", "_wbuf_len",
"_close"] "_close"]
def __init__(self, sock, mode='rb', bufsize=-1, close=False): def __init__(self, sock, mode='rb', bufsize=-1, close=False):
@ -261,6 +261,7 @@ class _fileobject(object):
# realloc()ed down much smaller than their original allocation. # realloc()ed down much smaller than their original allocation.
self._rbuf = StringIO() self._rbuf = StringIO()
self._wbuf = [] # A list of strings self._wbuf = [] # A list of strings
self._wbuf_len = 0
self._close = close self._close = close
def _getclosed(self): def _getclosed(self):
@ -287,6 +288,7 @@ class _fileobject(object):
if self._wbuf: if self._wbuf:
buffer = "".join(self._wbuf) buffer = "".join(self._wbuf)
self._wbuf = [] self._wbuf = []
self._wbuf_len = 0
self._sock.sendall(buffer) self._sock.sendall(buffer)
def fileno(self): def fileno(self):
@ -297,25 +299,22 @@ class _fileobject(object):
if not data: if not data:
return return
self._wbuf.append(data) self._wbuf.append(data)
self._wbuf_len += len(data)
if (self._wbufsize == 0 or if (self._wbufsize == 0 or
self._wbufsize == 1 and '\n' in data or self._wbufsize == 1 and '\n' in data or
self._get_wbuf_len() >= self._wbufsize): self._wbuf_len >= self._wbufsize):
self.flush() self.flush()
def writelines(self, list): def writelines(self, list):
# XXX We could do better here for very long lists # XXX We could do better here for very long lists
# XXX Should really reject non-string non-buffers # XXX Should really reject non-string non-buffers
self._wbuf.extend(filter(None, map(str, list))) lines = filter(None, map(str, list))
self._wbuf_len += sum(map(len, lines))
self._wbuf.extend(lines)
if (self._wbufsize <= 1 or if (self._wbufsize <= 1 or
self._get_wbuf_len() >= self._wbufsize): self._wbuf_len >= self._wbufsize):
self.flush() self.flush()
def _get_wbuf_len(self):
buf_len = 0
for x in self._wbuf:
buf_len += len(x)
return buf_len
def read(self, size=-1): def read(self, size=-1):
# Use max, disallow tiny reads in a loop as they are very inefficient. # Use max, disallow tiny reads in a loop as they are very inefficient.
# We never leave read() with any leftover data from a new recv() call # We never leave read() with any leftover data from a new recv() call