| hg-reviewers |
Staring at logs revealed the presence of empty frames that should have
contained payload. Let's stop that from happening.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/wireprotoframing.py (6 lines) | |||
| M | tests/test-wireproto-serverreactor.py (1 line) |
| # | # | ||||
| # * If a chunk is too large for a frame, we flush and emit frames | # * If a chunk is too large for a frame, we flush and emit frames | ||||
| # for the new chunk. | # for the new chunk. | ||||
| # * If a chunk can be buffered without total buffered size limits | # * If a chunk can be buffered without total buffered size limits | ||||
| # being exceeded, we do that. | # being exceeded, we do that. | ||||
| # * If a chunk causes us to go over our buffering limit, we flush | # * If a chunk causes us to go over our buffering limit, we flush | ||||
| # and then buffer the new chunk. | # and then buffer the new chunk. | ||||
| if not data: | |||||
| return | |||||
| if len(data) > self._maxsize: | if len(data) > self._maxsize: | ||||
| for frame in self._flush(): | for frame in self._flush(): | ||||
| yield frame | yield frame | ||||
| # Now emit frames for the big chunk. | # Now emit frames for the big chunk. | ||||
| offset = 0 | offset = 0 | ||||
| while True: | while True: | ||||
| chunk = data[offset:offset + self._maxsize] | chunk = data[offset:offset + self._maxsize] | ||||
| def _flush(self): | def _flush(self): | ||||
| payload = b''.join(self._chunks) | payload = b''.join(self._chunks) | ||||
| assert len(payload) <= self._maxsize | assert len(payload) <= self._maxsize | ||||
| self._chunks[:] = [] | self._chunks[:] = [] | ||||
| self._chunkssize = 0 | self._chunkssize = 0 | ||||
| if not payload: | |||||
| return | |||||
| yield self._stream.makeframe( | yield self._stream.makeframe( | ||||
| self._requestid, | self._requestid, | ||||
| typeid=FRAME_TYPE_COMMAND_RESPONSE, | typeid=FRAME_TYPE_COMMAND_RESPONSE, | ||||
| flags=FLAG_COMMAND_RESPONSE_CONTINUATION, | flags=FLAG_COMMAND_RESPONSE_CONTINUATION, | ||||
| payload=payload) | payload=payload) | ||||
| # TODO consider defining encoders/decoders using the util.compressionengine | # TODO consider defining encoders/decoders using the util.compressionengine | ||||
| # mechanism. | # mechanism. | ||||
| result = reactor.oncommandresponsereadyobjects( | result = reactor.oncommandresponsereadyobjects( | ||||
| outstream, 1, [first + second]) | outstream, 1, [first + second]) | ||||
| self.assertaction(result, b'sendframes') | self.assertaction(result, b'sendframes') | ||||
| self.assertframesequal(result[1][b'framegen'], [ | self.assertframesequal(result[1][b'framegen'], [ | ||||
| b'1 2 stream-begin command-response continuation %s' % OK, | b'1 2 stream-begin command-response continuation %s' % OK, | ||||
| b'1 2 0 command-response continuation Y\x80d', | b'1 2 0 command-response continuation Y\x80d', | ||||
| b'1 2 0 command-response continuation %s' % first, | b'1 2 0 command-response continuation %s' % first, | ||||
| b'1 2 0 command-response continuation %s' % second, | b'1 2 0 command-response continuation %s' % second, | ||||
| b'1 2 0 command-response continuation ', | |||||
| b'1 2 0 command-response eos ' | b'1 2 0 command-response eos ' | ||||
| ]) | ]) | ||||
| def testservererror(self): | def testservererror(self): | ||||
| reactor = makereactor() | reactor = makereactor() | ||||
| instream = framing.stream(1) | instream = framing.stream(1) | ||||
| list(sendcommandframes(reactor, instream, 1, b'mycommand', {})) | list(sendcommandframes(reactor, instream, 1, b'mycommand', {})) | ||||