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

fallback: fix BufferFull with sloppy consume

Browse source
This commit is contained in:
Bas Westerbaan 2014-06-15 22:45:30 +02:00
parent b334d441c3
commit 0532ea87fb
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
msgpack/fallback.py
View file

@ -166,6 +166,11 @@ class Unpacker(object):
self._fb_buf_o = 0 self._fb_buf_o = 0
self._fb_buf_i = 0 self._fb_buf_i = 0
self._fb_buf_n = 0 self._fb_buf_n = 0
# When Unpacker is used as an iterable, between the calls to next(),
# the buffer is not "consumed" completely, for efficiency sake.
# Instead, it is done sloppily. To make sure we raise BufferFull at
# the correct moments, we have to keep track of how sloppy we were.
self._fb_sloppiness = 0
self._max_buffer_size = max_buffer_size or 2**31-1 self._max_buffer_size = max_buffer_size or 2**31-1
if read_size > self._max_buffer_size: if read_size > self._max_buffer_size:
raise ValueError("read_size must be smaller than max_buffer_size") raise ValueError("read_size must be smaller than max_buffer_size")
@ -196,7 +201,8 @@ class Unpacker(object):
elif isinstance(next_bytes, bytearray): elif isinstance(next_bytes, bytearray):
next_bytes = bytes(next_bytes) next_bytes = bytes(next_bytes)
assert self._fb_feeding assert self._fb_feeding
if self._fb_buf_n + len(next_bytes) > self._max_buffer_size: if (self._fb_buf_n + len(next_bytes) - self._fb_sloppiness
> self._max_buffer_size):
raise BufferFull raise BufferFull
self._fb_buf_n += len(next_bytes) self._fb_buf_n += len(next_bytes)
self._fb_buffers.append(next_bytes) self._fb_buffers.append(next_bytes)
@ -208,6 +214,10 @@ class Unpacker(object):
self._fb_buf_n -= len(self._fb_buffers[i]) self._fb_buf_n -= len(self._fb_buffers[i])
self._fb_buffers = self._fb_buffers[self._fb_buf_i:] self._fb_buffers = self._fb_buffers[self._fb_buf_i:]
self._fb_buf_i = 0 self._fb_buf_i = 0
if self._fb_buffers:
self._fb_sloppiness = self._fb_buf_o
else:
self._fb_sloppiness = 0
def _fb_consume(self): def _fb_consume(self):
""" Gets rid of the used parts of the buffer. """ """ Gets rid of the used parts of the buffer. """
@ -222,6 +232,7 @@ class Unpacker(object):
else: else:
self._fb_buf_n = 0 self._fb_buf_n = 0
self._fb_buf_o = 0 self._fb_buf_o = 0
self._fb_sloppiness = 0
def _fb_got_extradata(self): def _fb_got_extradata(self):
if self._fb_buf_i != len(self._fb_buffers): if self._fb_buf_i != len(self._fb_buffers):