arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-25 16:08:32 +00:00
Code Issues Releases Wiki Activity

core: fix synthetic events breaking io.poll delay calculation

Browse Source
This commit is contained in:
matejcik 2020-07-10 11:54:33 +02:00 committed by matejcik
parent 2b9613c8a0
commit 2c4ecff0a4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/trezor/loop.py
View File

@ -121,12 +121,6 @@ def run() -> None:
task_entry = [0, 0, 0] # deadline, task, value task_entry = [0, 0, 0] # deadline, task, value
msg_entry = [0, 0] # iface | flags, value msg_entry = [0, 0] # iface | flags, value
while _queue or _paused: 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__: if __debug__:
# process synthetic events # process synthetic events
if synthetic_events: if synthetic_events:
@ -137,6 +131,16 @@ def run() -> None:
for task in msg_tasks: for task in msg_tasks:
_step(task, event) _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): if io.poll(_paused, msg_entry, delay):
# message received, run tasks paused on the interface # message received, run tasks paused on the interface
msg_tasks = _paused.pop(msg_entry[0], ()) msg_tasks = _paused.pop(msg_entry[0], ())