traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 73145 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73145 | kristjan.jonsson | 2009-06-02 06:14:08 -0700 (Tue, 02 Jun 2009) | 2 lines

  http://bugs.python.org/issue6117
  Fix O(n**2) performance problem in socket._fileobject
........
This commit is contained in:
Gregory P. Smith 2009-08-15 06:40:49 +00:00
parent 72da8f29a6
commit 1cfc9c0ef3
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/socket.py
View File

@ -229,7 +229,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):
@ -255,6 +255,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):
@ -281,6 +282,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):
@ -291,24 +293,24 @@ 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): def _get_wbuf_len(self):
buf_len = 0 return self._wbuf_len
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.

3
Misc/NEWS
View File

@ -70,6 +70,9 @@ Core and Builtins
Library Library
------- -------
- Issue #6117: Fix O(n**2) performance degradation when outputting lots of
small data on a buffered socket.socket.makefile() object.
- Issue #6637: defaultdict.copy() did not work when the default factory - Issue #6637: defaultdict.copy() did not work when the default factory
was left unspecified. Also, the eval/repr round-trip would fail when was left unspecified. Also, the eval/repr round-trip would fail when
the default_factory was None. the default_factory was None.