From 238da88a33358d2a2f99e24e2eb8a885aedc0ba5 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 18 Jan 2024 20:45:41 -0800 Subject: [PATCH] manager: merge prepare and init old-commit-hash: ce947ffe9a1f31190b89b83e2266bf2a78f2d798 --- selfdrive/manager/manager.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py index 2bc14945fe..13b03c4dce 100755 --- a/selfdrive/manager/manager.py +++ b/selfdrive/manager/manager.py @@ -105,8 +105,7 @@ def manager_init() -> None: dirty=is_dirty(), device=HARDWARE.get_device_type()) - -def manager_prepare() -> None: + # preimport all processes for p in managed_processes.values(): p.prepare() @@ -186,17 +185,8 @@ def manager_thread() -> None: def main() -> None: - prepare_only = os.getenv("PREPAREONLY") is not None - manager_init() - - # Start UI early so prepare can happen in the background - if not prepare_only: - managed_processes['ui'].start() - - manager_prepare() - - if prepare_only: + if os.getenv("PREPAREONLY") is not None: return # SystemExit on sigterm