From f98982c96dd45b171ffe8f94af55de708f0b916d Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Thu, 18 Jul 2024 16:24:31 +0800 Subject: [PATCH] analyzer: avoid copy of analyzer dump --- artiq/coredevice/comm_analyzer.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/artiq/coredevice/comm_analyzer.py b/artiq/coredevice/comm_analyzer.py index 9fad6666a..59ff00d84 100644 --- a/artiq/coredevice/comm_analyzer.py +++ b/artiq/coredevice/comm_analyzer.py @@ -181,25 +181,25 @@ class AnalyzerProxyReceiver: async def _receive_cr(self): try: while True: - endian_byte = await self.reader.read(1) - if endian_byte == b"E": - endian = '>' - elif endian_byte == b"e": - endian = '<' - elif endian_byte == b"": + data = bytearray() + data.extend(await self.reader.read(1)) + if len(data) == 0: # EOF reached, connection lost return + if data[0] == ord("E"): + endian = '>' + elif data[0] == ord("e"): + endian = '<' else: raise ValueError - payload_length_word = await self.reader.readexactly(4) - payload_length = struct.unpack(endian + "I", payload_length_word)[0] + data.extend(await self.reader.readexactly(4)) + payload_length = struct.unpack(endian + "I", data[1:5])[0] if payload_length > 10 * 512 * 1024: # 10x buffer size of firmware raise ValueError # The remaining header length is 11 bytes. - remaining_data = await self.reader.readexactly(payload_length + 11) - data = endian_byte + payload_length_word + remaining_data + data.extend(await self.reader.readexactly(payload_length + 11)) self.receive_cb(data) except Exception: logger.error("analyzer receiver connection terminating with exception", exc_info=True)