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

Revert "fix(core): retry creation of homescreen layout"

Browse Source 
This reverts commit e0b4cab2db.

[no changelog]
This commit is contained in:
Roman Zeyde 2025-03-18 09:08:34 +02:00
parent 5fd168c363
commit 148b9c9d28
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/trezor/ui/layouts/homescreen.py
View File

@ -6,37 +6,10 @@ from storage.cache_common import APP_COMMON_BUSY_DEADLINE_MS
from trezor import TR, ui from trezor import TR, ui
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import Any, Callable, Iterator, ParamSpec, TypeVar from typing import Any, Iterator
from trezor import loop from trezor import loop
P = ParamSpec("P")
R = TypeVar("R")
def _retry_with_gc(layout: Callable[P, R], *args: P.args, **kwargs: P.kwargs) -> R:
"""Retry creating the layout after garbage collection.
For reasons unknown, a previous homescreen layout may survive an unimport, and still
exists in the GC arena. At the time a new one is instantiated, the old one still
holds a lock on the JPEG buffer, and creating a new layout will fail with a
MemoryError.
It seems that the previous layout's survival is a glitch, and at a later time it is
still in memory but not held anymore. We assume that triggering a GC cycle will
correctly throw it away, and we will be able to create the new layout.
We only try this once because if it didn't help, the above assumption is wrong, so
no point in trying again.
"""
try:
return layout(*args, **kwargs)
except MemoryError:
import gc
gc.collect()
return layout(*args, **kwargs)
class HomescreenBase(ui.Layout): class HomescreenBase(ui.Layout):
RENDER_INDICATOR: object | None = None RENDER_INDICATOR: object | None = None
@ -83,8 +56,7 @@ class Homescreen(HomescreenBase):
level = 0 level = 0
super().__init__( super().__init__(
layout=_retry_with_gc( layout=trezorui_api.show_homescreen(
trezorui_api.show_homescreen,
label=label, label=label,
notification=notification, notification=notification,
notification_level=level, notification_level=level,
@ -124,8 +96,7 @@ class Lockscreen(HomescreenBase):
not bootscreen and storage_cache.homescreen_shown is self.RENDER_INDICATOR not bootscreen and storage_cache.homescreen_shown is self.RENDER_INDICATOR
) )
super().__init__( super().__init__(
layout=_retry_with_gc( layout=trezorui_api.show_lockscreen(
trezorui_api.show_lockscreen,
label=label, label=label,
bootscreen=bootscreen, bootscreen=bootscreen,
skip_first_paint=skip, skip_first_paint=skip,
@ -146,8 +117,7 @@ class Busyscreen(HomescreenBase):
def __init__(self, delay_ms: int) -> None: def __init__(self, delay_ms: int) -> None:
super().__init__( super().__init__(
layout=_retry_with_gc( layout=trezorui_api.show_progress_coinjoin(
trezorui_api.show_progress_coinjoin,
title=TR.coinjoin__waiting_for_others, title=TR.coinjoin__waiting_for_others,
indeterminate=True, indeterminate=True,
time_ms=delay_ms, time_ms=delay_ms,