arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-29 10:58:21 +00:00
Code Issues Releases Wiki Activity

core: improve log messages in workflow and wire

Browse Source
This commit is contained in:
Jan Pochyla 2019-09-02 12:48:49 +02:00
parent bdaf4cd069
commit ccb926af53
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/trezor/wire/__init__.py
View File

@ -251,6 +251,15 @@ async def handle_session(iface: WireInterface, session_id: int) -> None:
# header is eventually received, after a couple of tries. # header is eventually received, after a couple of tries.
req_reader = ctx.make_reader() req_reader = ctx.make_reader()
await req_reader.aopen() await req_reader.aopen()
if __debug__:
log.debug(
__name__,
"%s:%x receive: %s",
iface.iface_num(),
session_id,
req_reader.type,
)
else: else:
# We have a reader left over from earlier. We should process # We have a reader left over from earlier. We should process
# this message instead of waiting for new one. # this message instead of waiting for new one.

3
core/src/trezor/wire/codec_v1.py
View File

@ -31,6 +31,9 @@ class Reader:
self.ofs = 0 self.ofs = 0
self.data = bytes() self.data = bytes()
def __repr__(self) -> str:
return "<Reader type: %s>" % self.type
async def aopen(self) -> None: async def aopen(self) -> None:
""" """
Start reading a message by waiting for initial message report. Because Start reading a message by waiting for initial message report. Because

23
core/src/trezor/workflow.py
View File

@ -1,4 +1,4 @@
from trezor import loop from trezor import log, loop
if False: if False:
from typing import Callable, Optional, Set from typing import Callable, Optional, Set
@ -34,6 +34,8 @@ def on_start(workflow: loop.Task) -> None:
def on_close(workflow: loop.Task) -> None: def on_close(workflow: loop.Task) -> None:
"""Call when a workflow task has finished running.""" """Call when a workflow task has finished running."""
# Remove task from the running set. # Remove task from the running set.
if __debug__:
log.debug(__name__, "close: %s", workflow)
tasks.remove(workflow) tasks.remove(workflow)
if not tasks and default_constructor: if not tasks and default_constructor:
# If no workflows are running, we should create a new default workflow # If no workflows are running, we should create a new default workflow
@ -54,15 +56,21 @@ def start_default(constructor: Callable[[], loop.Task]) -> None:
if not default_task: if not default_task:
default_constructor = constructor default_constructor = constructor
default_task = constructor() default_task = constructor()
if __debug__:
log.debug(__name__, "start default")
# Schedule the default task. Because the task can complete on its own, # Schedule the default task. Because the task can complete on its own,
# we need to reset the `default_task` global in a finalizer. # we need to reset the `default_task` global in a finalizer.
loop.schedule(default_task, None, None, _finalize_default) loop.schedule(default_task, None, None, _finalize_default)
else:
if __debug__:
log.debug(__name__, "default already started")
def close_default() -> None: def close_default() -> None:
"""Explicitly close the default workflow task.""" """Explicitly close the default workflow task."""
if default_task: if default_task:
if __debug__:
log.debug(__name__, "close default")
# We let the `_finalize_default` reset the global. # We let the `_finalize_default` reset the global.
loop.close(default_task) loop.close(default_task)
@ -71,4 +79,15 @@ def _finalize_default(task, value) -> None:
global default_task global default_task
if default_task is task: if default_task is task:
if __debug__:
log.debug(__name__, "default closed")
default_task = None default_task = None
else:
if __debug__:
log.warning(
__name__,
"default task does not match: task=%s, default_task=%s",
task,
default_task,
)