diff --git a/tools/opz_os_read.py b/tools/opz_os_read.py index dad62a4..6d953e2 100755 --- a/tools/opz_os_read.py +++ b/tools/opz_os_read.py @@ -169,7 +169,7 @@ def collect(self, want_type, first_timeout, idle_timeout, progress=False): logs, start = [], time.monotonic() last, started, pend = start, False, None while True: - chunk = self.port.read(65536) + chunk = self.port.read(self.port.in_waiting or 1) now = time.monotonic() if chunk: last = now diff --git a/tools/tests/test_opz_os_read.py b/tools/tests/test_opz_os_read.py index edb0ba7..f0f8c23 100644 --- a/tools/tests/test_opz_os_read.py +++ b/tools/tests/test_opz_os_read.py @@ -84,6 +84,13 @@ def write(self, frame): def flush(self): pass + @property + def in_waiting(self): + k = min(self.chunk, len(self.queue)) + if self.stall_after is not None: + k = min(k, max(0, self.stall_after - self.sent)) + return k + def read(self, n): if self.stall_after is not None and self.sent >= self.stall_after: self.clock.t += 0.5