From 2c4ecff0a4197202b3cbd44b43ba2dc07c70d7bb Mon Sep 17 00:00:00 2001 From: matejcik Date: Fri, 10 Jul 2020 11:54:33 +0200 Subject: [PATCH] core: fix synthetic events breaking io.poll delay calculation --- core/src/trezor/loop.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/core/src/trezor/loop.py b/core/src/trezor/loop.py index 1c0415bdba..cb520520e3 100644 --- a/core/src/trezor/loop.py +++ b/core/src/trezor/loop.py @@ -121,12 +121,6 @@ def run() -> None: task_entry = [0, 0, 0] # deadline, task, value msg_entry = [0, 0] # iface | flags, value while _queue or _paused: - # compute the maximum amount of time we can wait for a message - if _queue: - delay = utime.ticks_diff(_queue.peektime(), utime.ticks_ms()) - else: - delay = 1000 # wait for 1 sec maximum if queue is empty - if __debug__: # process synthetic events if synthetic_events: @@ -137,6 +131,16 @@ def run() -> None: for task in msg_tasks: _step(task, event) + # XXX: we assume that synthetic events are rare. If there is a lot of them, + # this degrades to "while synthetic_events" and would ignore all real ones. + continue + + # compute the maximum amount of time we can wait for a message + if _queue: + delay = utime.ticks_diff(_queue.peektime(), utime.ticks_ms()) + else: + delay = 1000 # wait for 1 sec maximum if queue is empty + if io.poll(_paused, msg_entry, delay): # message received, run tasks paused on the interface msg_tasks = _paused.pop(msg_entry[0], ())