Fix msgq context overrides (commaai#33014)

* Fix msgq context overrides

* Remove unneccesary changes

* add reset_context helper

* Remove redundant import

cereal/messaging/__init__.py

@@ -2,7 +2,8 @@
 from msgq.ipc_pyx import Context, Poller, SubSocket, PubSocket, SocketEventHandle, toggle_fake_events, \
                                 set_fake_prefix, get_fake_prefix, delete_fake_prefix, wait_for_one_event
 from msgq.ipc_pyx import MultiplePublishersError, IpcError
-from msgq import fake_event_handle, pub_sock, sub_sock, drain_sock_raw, context
+from msgq import fake_event_handle, pub_sock, sub_sock, drain_sock_raw
+import msgq
 
 import os
 import capnp
@@ -17,6 +18,10 @@
 NO_TRAVERSAL_LIMIT = 2**64-1
 
 
+def reset_context():
+  msgq.context = Context()
+
+
 def log_from_bytes(dat: bytes, struct: capnp.lib.capnp._StructModule = log.Event) -> capnp.lib.capnp._DynamicStructReader:
   with struct.from_bytes(dat, traversal_limit_in_words=NO_TRAVERSAL_LIMIT) as msg:
     return msg

selfdrive/debug/internal/measure_torque_time_to_max.py

@@ -18,7 +18,7 @@
 
   if args.addr != "127.0.0.1":
     os.environ["ZMQ"] = "1"
-    messaging.context = messaging.Context()
+    messaging.reset_context()
 
   poller = messaging.Poller()
   messaging.sub_sock('can', poller, addr=args.addr)

system/manager/process.py

@@ -30,7 +30,7 @@ def launcher(proc: str, name: str) -> None:
     setthreadname(proc)
 
     # create new context since we forked
-    messaging.context = messaging.Context()
+    messaging.reset_context()
 
     # add daemon name tag to logs
     cloudlog.bind(daemon=name)

tools/camerastream/compressed_vipc.py

@@ -8,6 +8,7 @@
 import time
 import signal
 
+
 import cereal.messaging as messaging
 from msgq.visionipc import VisionIpcServer, VisionStreamType
 
@@ -42,7 +43,7 @@ def decoder(addr, vipc_server, vst, nvidia, W, H, debug=False):
     codec = av.CodecContext.create("hevc", "r")
 
   os.environ["ZMQ"] = "1"
-  messaging.context = messaging.Context()
+  messaging.reset_context()
   sock = messaging.sub_sock(sock_name, None, addr=addr, conflate=False)
   cnt = 0
   last_idx = -1
@@ -109,12 +110,12 @@ class CompressedVipc:
   def __init__(self, addr, vision_streams, nvidia=False, debug=False):
     print("getting frame sizes")
     os.environ["ZMQ"] = "1"
-    messaging.context = messaging.Context()
+    messaging.reset_context()
     sm = messaging.SubMaster([ENCODE_SOCKETS[s] for s in vision_streams], addr=addr)
     while min(sm.recv_frame.values()) == 0:
       sm.update(100)
     os.environ.pop("ZMQ")
-    messaging.context = messaging.Context()
+    messaging.reset_context()
 
     self.vipc_server = VisionIpcServer("camerad")
     for vst in vision_streams:

tools/lib/live_logreader.py

@@ -10,7 +10,7 @@
 def raw_live_logreader(services: list[str] = ALL_SERVICES, addr: str = '127.0.0.1') -> RawLogIterable:
   if addr != "127.0.0.1":
     os.environ["ZMQ"] = "1"
-    messaging.context = messaging.Context()
+    messaging.reset_context()
 
   poller = messaging.Poller()
 

tools/replay/rp_visualization.py

@@ -53,7 +53,7 @@ def get_arg_parser():
   args = get_arg_parser().parse_args(sys.argv[1:])
   if args.ip_address != "127.0.0.1":
     os.environ["ZMQ"] = "1"
-    messaging.context = messaging.Context()
+    messaging.reset_context()
   rr.init("RadarPoints", spawn= True)
   rr.log("tracks", rr.AnnotationContext(rerunColorPalette), static=True)
   visualize(args.ip_address)

tools/tuning/measure_steering_accuracy.py

@@ -147,7 +147,7 @@ def update(self, sm):
   else:
     if args.addr != "127.0.0.1":
       os.environ["ZMQ"] = "1"
-      messaging.context = messaging.Context()
+      messaging.reset_context()
 
     carControl = messaging.sub_sock('carControl', addr=args.addr, conflate=True)
     sm = messaging.SubMaster(['carState', 'carControl', 'carOutput', 'controlsState', 'modelV2'], addr=args.addr)