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

fallback: do not use dynamic format strings for struct.(un)pack

Browse source 
Increases performance on PyPy.
This commit is contained in:
Bas Westerbaan 2013-01-29 02:15:29 +01:00
parent af9c9ca2c9
commit 94925acb12
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
msgpack/fallback.py
View file

@ -258,7 +258,7 @@ class Unpacker(object):
obj = struct.unpack("b", chr(b))[0] obj = struct.unpack("b", chr(b))[0]
elif b & 0b11100000 == 0b10100000: elif b & 0b11100000 == 0b10100000:
n = b & 0b00011111 n = b & 0b00011111
obj = struct.unpack("%ds" % n, self._fb_read(n, write_bytes))[0] obj = self._fb_read(n, write_bytes)
typ = TYPE_RAW typ = TYPE_RAW
elif b & 0b11110000 == 0b10010000: elif b & 0b11110000 == 0b10010000:
n = b & 0b00001111 n = b & 0b00001111
@ -294,11 +294,11 @@ class Unpacker(object):
obj = struct.unpack(">q", self._fb_read(8, write_bytes))[0] obj = struct.unpack(">q", self._fb_read(8, write_bytes))[0]
elif b == 0xda: elif b == 0xda:
n = struct.unpack(">H", self._fb_read(2, write_bytes))[0] n = struct.unpack(">H", self._fb_read(2, write_bytes))[0]
obj = struct.unpack("%ds" % n, self._fb_read(n, write_bytes))[0] obj = self._fb_read(n, write_bytes)
typ = TYPE_RAW typ = TYPE_RAW
elif b == 0xdb: elif b == 0xdb:
n = struct.unpack(">I", self._fb_read(4, write_bytes))[0] n = struct.unpack(">I", self._fb_read(4, write_bytes))[0]
obj = struct.unpack("%ds" % n, self._fb_read(n, write_bytes))[0] obj = self._fb_read(n, write_bytes)
typ = TYPE_RAW typ = TYPE_RAW
elif b == 0xdc: elif b == 0xdc:
n = struct.unpack(">H", self._fb_read(2, write_bytes))[0] n = struct.unpack(">H", self._fb_read(2, write_bytes))[0]
@ -433,9 +433,11 @@ class Packer(object):
self.buffer.write(chr(0xa0 + n)) self.buffer.write(chr(0xa0 + n))
return self.buffer.write(obj) return self.buffer.write(obj)
if n <= 0xffff: if n <= 0xffff:
return self.buffer.write(struct.pack(">BH%ds" % n,0xda, n, obj)) self.buffer.write(struct.pack(">BH", 0xda, n))
return self.buffer.write(obj)
if n <= 0xffffffff: if n <= 0xffffffff:
return self.buffer.write(struct.pack(">BI%ds" % n,0xdb, n, obj)) self.buffer.write(struct.pack(">BI", 0xdb, n))
return self.buffer.write(obj)
raise PackValueError("String is too large") raise PackValueError("String is too large")
if isinstance(obj, float): if isinstance(obj, float):
if self.use_float: if self.use_float: