Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate another malloc+copy

Browse Source
This commit is contained in:
Kovid Goyal 2015-10-28 12:23:08 +05:30
parent abb62bc65f
commit af07373638
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/srv/web_socket.py
View File

@ -60,6 +60,7 @@ class ReadFrame(object): # {{{
def __init__(self): def __init__(self):
self.header_buf = bytearray(14) self.header_buf = bytearray(14)
self.rbuf = bytearray(CHUNK_SIZE) self.rbuf = bytearray(CHUNK_SIZE)
self.empty = memoryview(b'')
self.reset() self.reset()
def reset(self): def reset(self):
@ -136,7 +137,7 @@ class ReadFrame(object): # {{{
self.bytes_received = 0 self.bytes_received = 0
if self.payload_length <= CHUNK_SIZE: if self.payload_length <= CHUNK_SIZE:
if self.payload_length == 0: if self.payload_length == 0:
conn.ws_data_received(b'', self.opcode, True, True, self.fin) conn.ws_data_received(self.empty, self.opcode, True, True, self.fin)
self.reset() self.reset()
else: else:
self.rview = memoryview(self.rbuf)[:self.payload_length] self.rview = memoryview(self.rbuf)[:self.payload_length]
@ -152,7 +153,7 @@ class ReadFrame(object): # {{{
if num_bytes >= len(self.rview): if num_bytes >= len(self.rview):
data = memoryview(self.rbuf)[:self.payload_length] data = memoryview(self.rbuf)[:self.payload_length]
fast_mask(data, self.mask) fast_mask(data, self.mask)
conn.ws_data_received(data.tobytes(), self.opcode, True, True, self.fin) conn.ws_data_received(data, self.opcode, True, True, self.fin)
self.reset() self.reset()
else: else:
self.rview = self.rview[num_bytes:] self.rview = self.rview[num_bytes:]
@ -165,7 +166,7 @@ class ReadFrame(object): # {{{
fast_mask(data, self.mask, self.bytes_received) fast_mask(data, self.mask, self.bytes_received)
self.bytes_received += num_bytes self.bytes_received += num_bytes
frame_finished = self.bytes_received >= self.payload_length frame_finished = self.bytes_received >= self.payload_length
conn.ws_data_received(data.tobytes(), self.opcode, self.frame_starting, frame_finished, self.fin) conn.ws_data_received(data, self.opcode, self.frame_starting, frame_finished, self.fin)
self.frame_starting = False self.frame_starting = False
if frame_finished: if frame_finished:
self.reset() self.reset()
@ -360,7 +361,7 @@ class WebSocketConnection(HTTPConnection):
if self.current_recv_opcode == TEXT: if self.current_recv_opcode == TEXT:
if message_starting: if message_starting:
self.frag_decoder.reset() self.frag_decoder.reset()
empty_data = not data empty_data = len(data) == 0
try: try:
data = self.frag_decoder(data) data = self.frag_decoder(data)
except ValueError: except ValueError:
@ -496,10 +497,12 @@ class WebSocketConnection(HTTPConnection):
self.control_frames.append(ReadOnlyFileBuffer(frame)) self.control_frames.append(ReadOnlyFileBuffer(frame))
def handle_websocket_data(self, data, message_starting, message_finished): def handle_websocket_data(self, data, message_starting, message_finished):
''' Called when some data is received from the remote client. In general the ''' Called when some data is received from the remote client. In
data may not constitute a complete "message", use the message_starting general the data may not constitute a complete "message", use the
and message_finished flags to re-assemble it into a complete message in message_starting and message_finished flags to re-assemble it into a
the handler. ''' complete message in the handler. Note that for binary data, data is a
mutable object. If you intend to keep it around after this method
returns, create a bytestring from it, using tobytes(). '''
self.websocket_handler.handle_websocket_data(self.websocket_connection_id, data, message_starting, message_finished) self.websocket_handler.handle_websocket_data(self.websocket_connection_id, data, message_starting, message_finished)