process replay clean up (#35878)

* format

* containers might not be set

* opts

* halves startup time for 12 procs (1.6 to 0.8s)

* stash

* Revert "stash"

This reverts commit 3e119a9602.

* Revert "halves startup time for 12 procs (1.6 to 0.8s)"

This reverts commit a39edf0a57.

* Revert "opts"

This reverts commit 4dc1f75f09.

* already set!
pull/35880/head
Shane Smiskol 4 days ago committed by GitHub
parent 1966845fc9
commit 9117a414bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      selfdrive/test/process_replay/process_replay.py

@ -34,6 +34,7 @@ NUMPY_TOLERANCE = 1e-7
PROC_REPLAY_DIR = os.path.dirname(os.path.abspath(__file__)) PROC_REPLAY_DIR = os.path.dirname(os.path.abspath(__file__))
FAKEDATA = os.path.join(PROC_REPLAY_DIR, "fakedata/") FAKEDATA = os.path.join(PROC_REPLAY_DIR, "fakedata/")
class DummySocket: class DummySocket:
def __init__(self): def __init__(self):
self.data: list[bytes] = [] self.data: list[bytes] = []
@ -47,6 +48,7 @@ class DummySocket:
def send(self, data: bytes): def send(self, data: bytes):
self.data.append(data) self.data.append(data)
class LauncherWithCapture: class LauncherWithCapture:
def __init__(self, capture: ProcessOutputCapture, launcher: Callable): def __init__(self, capture: ProcessOutputCapture, launcher: Callable):
self.capture = capture self.capture = capture
@ -64,7 +66,7 @@ class ReplayContext:
self.main_pub = cfg.main_pub self.main_pub = cfg.main_pub
self.main_pub_drained = cfg.main_pub_drained self.main_pub_drained = cfg.main_pub_drained
self.unlocked_pubs = cfg.unlocked_pubs self.unlocked_pubs = cfg.unlocked_pubs
assert(len(self.pubs) != 0 or self.main_pub is not None) assert len(self.pubs) != 0 or self.main_pub is not None
def __enter__(self): def __enter__(self):
self.open_context() self.open_context()
@ -372,7 +374,7 @@ def get_car_params_callback(rc, pm, msgs, fingerprint):
with car.CarParams.from_bytes(cached_params_raw) as _cached_params: with car.CarParams.from_bytes(cached_params_raw) as _cached_params:
cached_params = _cached_params cached_params = _cached_params
CP = get_car(*can_callbacks, lambda obd: None, Params().get_bool("AlphaLongitudinalEnabled"), False, cached_params=cached_params).CP CP = get_car(*can_callbacks, lambda obd: None, params.get_bool("AlphaLongitudinalEnabled"), False, cached_params=cached_params).CP
params.put("CarParams", CP.to_bytes()) params.put("CarParams", CP.to_bytes())
@ -712,8 +714,8 @@ def _replay_multi_process(
all_msgs = sorted(lr, key=lambda msg: msg.logMonoTime) all_msgs = sorted(lr, key=lambda msg: msg.logMonoTime)
log_msgs = [] log_msgs = []
containers = []
try: try:
containers = []
for cfg in cfgs: for cfg in cfgs:
container = ProcessContainer(cfg) container = ProcessContainer(cfg)
containers.append(container) containers.append(container)

Loading…
Cancel
Save