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

#1792: Improve performance of marshal.dumps() on large objects by increasing 

the size of the buffer more quickly.
This commit is contained in:
Andrew M. Kuchling 2008-05-11 13:33:56 +00:00
parent ab756f60bd
commit 6c02916dfb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_marshal.py
View File

@ -255,6 +255,14 @@ class BugsTestCase(unittest.TestCase):
subtyp = type('subtyp', (typ,), {}) subtyp = type('subtyp', (typ,), {})
self.assertRaises(ValueError, marshal.dumps, subtyp()) self.assertRaises(ValueError, marshal.dumps, subtyp())
# Issue #1792 introduced a change in how marshal increases the size of its
# internal buffer; this test ensures that the new code is exercised.
def test_large_marshal(self):
size = int(1e6)
testString = 'abc' * size
marshal.dumps(testString)
def test_main(): def test_main():
test_support.run_unittest(IntTestCase, test_support.run_unittest(IntTestCase,
FloatTestCase, FloatTestCase,

5
Python/marshal.c
View File

@ -65,7 +65,10 @@ w_more(int c, WFILE *p)
if (p->str == NULL) if (p->str == NULL)
return; /* An error already occurred */ return; /* An error already occurred */
size = PyString_Size(p->str); size = PyString_Size(p->str);
newsize = size + 1024; newsize = size + size + 1024;
if (newsize > 32*1024*1024) {
newsize = size + 1024*1024;
}
if (_PyString_Resize(&p->str, newsize) != 0) { if (_PyString_Resize(&p->str, newsize) != 0) {
p->ptr = p->end = NULL; p->ptr = p->end = NULL;
} }