Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-10-21 04:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fallback: use __pypy__.builders.StringBuilder when available

Browse source 
This increases performance *a lot* on PyPy.

Signed-off-by: Bas Westerbaan <bas@westerbaan.name>
This commit is contained in:
Bas Westerbaan 2013-01-28 13:30:32 +01:00
parent 2627b6ae9f
commit 69ba3c9bf9
1 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

46
msgpack/fallback.py
View file

@ -4,10 +4,28 @@ import sys
import array import array
import struct import struct
try: if hasattr(sys, 'pypy_version_info'):
import cStringIO as StringIO # cStringIO is slow on PyPy, StringIO is faster. However: PyPy's own
except ImportError: # StringBuilder is fastest.
import StringIO from __pypy__.builders import StringBuilder
USING_STRINGBUILDER = True
class StringIO(object):
def __init__(self, s=''):
if s:
self.builder = StringBuilder(len(s))
self.builder.append(s)
else:
self.builder = StringBuilder()
def write(self, s):
self.builder.append(s)
def getvalue(self):
return self.builder.build()
else:
USING_STRINGBUILDER = False
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
from msgpack.exceptions import ( from msgpack.exceptions import (
BufferFull, BufferFull,
@ -362,7 +380,7 @@ class Packer(object):
self.autoreset = autoreset self.autoreset = autoreset
self.encoding = encoding self.encoding = encoding
self.unicode_errors = unicode_errors self.unicode_errors = unicode_errors
self.buffer = StringIO.StringIO() self.buffer = StringIO()
if default is not None: if default is not None:
if not callable(default): if not callable(default):
raise TypeError("default must be callable") raise TypeError("default must be callable")
@ -429,25 +447,33 @@ class Packer(object):
self._pack(obj) self._pack(obj)
ret = self.buffer.getvalue() ret = self.buffer.getvalue()
if self.autoreset: if self.autoreset:
self.buffer = StringIO.StringIO() self.buffer = StringIO()
elif USING_STRINGBUILDER:
self.buffer = StringIO(ret)
return ret return ret
def pack_map_pairs(self, pairs): def pack_map_pairs(self, pairs):
self._fb_pack_map_pairs(len(pairs), pairs) self._fb_pack_map_pairs(len(pairs), pairs)
ret = self.buffer.getvalue() ret = self.buffer.getvalue()
if self.autoreset: if self.autoreset:
self.buffer = StringIO.StringIO() self.buffer = StringIO()
elif USING_STRINGBUILDER:
self.buffer = StringIO(ret)
return ret return ret
def pack_array_header(self, n): def pack_array_header(self, n):
self._fb_pack_array_header(n) self._fb_pack_array_header(n)
ret = self.buffer.getvalue() ret = self.buffer.getvalue()
if self.autoreset: if self.autoreset:
self.buffer = StringIO.StringIO() self.buffer = StringIO()
elif USING_STRINGBUILDER:
self.buffer = StringIO(ret)
return ret return ret
def pack_map_header(self, n): def pack_map_header(self, n):
self._fb_pack_map_header(n) self._fb_pack_map_header(n)
ret = self.buffer.getvalue() ret = self.buffer.getvalue()
if self.autoreset: if self.autoreset:
self.buffer = StringIO.StringIO() self.buffer = StringIO()
elif USING_STRINGBUILDER:
self.buffer = StringIO(ret)
return ret return ret
def _fb_pack_array_header(self, n): def _fb_pack_array_header(self, n):
if n <= 0x0f: if n <= 0x0f:
@ -473,4 +499,4 @@ class Packer(object):
def bytes(self): def bytes(self):
return self.buffer.getvalue() return self.buffer.getvalue()
def reset(self): def reset(self):
self.buffer = StringIO.StringIO() self.buffer = StringIO()