Split cereal into cereal/msgq (#32631)

* squash

* fix doc

* compile device

* compile device

* Update ref

* add msgq to precommit exclusions

* No service ports

* fix compile

* address comments

* More comments

* Delete logger

* Update opendbc

* Linting

* bump msgq

system/camerad/SConscript

@@ -1,6 +1,6 @@
-Import('env', 'arch', 'cereal', 'messaging', 'common', 'gpucommon', 'visionipc')
+Import('env', 'arch', 'cereal', 'messaging', 'common', 'gpucommon', 'visionipc', 'socketmaster')
 
-libs = ['m', 'pthread', common, 'jpeg', 'OpenCL', 'yuv', cereal, messaging, 'zmq', 'capnp', 'kj', visionipc, gpucommon, 'atomic']
+libs = ['m', 'pthread', common, 'jpeg', 'OpenCL', 'yuv', cereal, socketmaster, messaging, 'zmq', 'capnp', 'kj', visionipc, gpucommon, 'atomic']
 
 camera_obj = env.Object(['cameras/camera_qcom2.cc', 'cameras/camera_common.cc', 'cameras/camera_util.cc',
                          'sensors/ar0231.cc', 'sensors/ox03c10.cc', 'sensors/os04c10.cc'])

system/camerad/cameras/camera_common.h

@@ -5,7 +5,7 @@
 #include <thread>
 
 #include "cereal/messaging/messaging.h"
-#include "cereal/visionipc/visionipc_server.h"
+#include "msgq/visionipc/visionipc_server.h"
 #include "common/queue.h"
 #include "common/util.h"
 

system/camerad/snapshot/snapshot.py

@@ -6,7 +6,7 @@ import numpy as np
 from PIL import Image
 
 import cereal.messaging as messaging
-from cereal.visionipc import VisionIpcClient, VisionStreamType
+from msgq.visionipc import VisionIpcClient, VisionStreamType
 from openpilot.common.params import Params
 from openpilot.common.realtime import DT_MDL
 from openpilot.system.hardware import PC

system/hardware/base.h

@@ -5,7 +5,7 @@
 #include <map>
 #include <string>
 
-#include "cereal/messaging/messaging.h"
+#include "cereal/gen/cpp/log.capnp.h"
 
 // no-op base hw class
 class HardwareNone {

system/logcatd/SConscript

@@ -1,3 +1,3 @@
-Import('env', 'cereal', 'messaging', 'common')
+Import('env', 'cereal', 'messaging', 'common', 'socketmaster')
 
-env.Program('logcatd', 'logcatd_systemd.cc', LIBS=[cereal, messaging, common, 'zmq', 'capnp', 'kj', 'systemd', 'json11'])
+env.Program('logcatd', 'logcatd_systemd.cc', LIBS=[cereal, socketmaster, messaging, common, 'zmq', 'capnp', 'kj', 'systemd', 'json11'])

system/loggerd/SConscript

@@ -1,6 +1,6 @@
-Import('env', 'arch', 'cereal', 'messaging', 'common', 'visionipc')
+Import('env', 'arch', 'cereal', 'messaging', 'common', 'visionipc', 'socketmaster')
 
-libs = [common, cereal, messaging, visionipc,
+libs = [common, cereal, socketmaster, messaging, visionipc,
         'zmq', 'capnp', 'kj', 'z',
         'avformat', 'avcodec', 'swscale', 'avutil',
         'yuv', 'OpenCL', 'pthread']

system/loggerd/encoder/encoder.h

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "cereal/messaging/messaging.h"
-#include "cereal/visionipc/visionipc.h"
+#include "msgq/visionipc/visionipc.h"
 #include "common/queue.h"
 #include "system/camerad/cameras/camera_common.h"
 #include "system/loggerd/loggerd.h"

system/loggerd/loggerd.cc

@@ -215,7 +215,7 @@ void loggerd_thread() {
     const bool encoder = util::ends_with(it.name, "EncodeData");
     const bool livestream_encoder = util::starts_with(it.name, "livestream");
     if (!it.should_log && (!encoder || livestream_encoder)) continue;
-    LOGD("logging %s (on port %d)", it.name.c_str(), it.port);
+    LOGD("logging %s", it.name.c_str());
 
     SubSocket * sock = SubSocket::create(ctx.get(), it.name);
     assert(sock != NULL);

system/loggerd/loggerd.h

@@ -4,7 +4,7 @@
 
 #include "cereal/messaging/messaging.h"
 #include "cereal/services.h"
-#include "cereal/visionipc/visionipc_client.h"
+#include "msgq/visionipc/visionipc_client.h"
 #include "system/camerad/cameras/camera_common.h"
 #include "system/hardware/hw.h"
 #include "common/params.h"

system/loggerd/tests/test_loggerd.py

@@ -22,7 +22,7 @@ from openpilot.system.manager.process_config import managed_processes
 from openpilot.system.version import get_version
 from openpilot.tools.lib.helpers import RE
 from openpilot.tools.lib.logreader import LogReader
-from cereal.visionipc import VisionIpcServer, VisionStreamType
+from msgq.visionipc import VisionIpcServer, VisionStreamType
 from openpilot.common.transformations.camera import DEVICE_CAMERAS
 
 SentinelType = log.Sentinel.SentinelType

system/proclogd/SConscript

@@ -1,5 +1,5 @@
-Import('env', 'cereal', 'messaging', 'common')
-libs = [cereal, messaging, 'pthread', 'zmq', 'capnp', 'kj', 'common', 'zmq', 'json11']
+Import('env', 'cereal', 'messaging', 'common', 'socketmaster')
+libs = [cereal, socketmaster, messaging, 'pthread', 'zmq', 'capnp', 'kj', 'common', 'zmq', 'json11']
 env.Program('proclogd', ['main.cc', 'proclog.cc'], LIBS=libs)
 
 if GetOption('extras'):

system/sensord/SConscript

@@ -1,4 +1,4 @@
-Import('env', 'arch', 'common', 'cereal', 'messaging')
+Import('env', 'arch', 'common', 'cereal', 'messaging', 'socketmaster')
 
 sensors = [
   'sensors/i2c_sensor.cc',
@@ -11,7 +11,7 @@ sensors = [
   'sensors/lsm6ds3_temp.cc',
   'sensors/mmc5603nj_magn.cc',
 ]
-libs = [common, cereal, messaging, 'capnp', 'zmq', 'kj', 'pthread']
+libs = [common, socketmaster, cereal, messaging, 'capnp', 'zmq', 'kj', 'pthread']
 if arch == "larch64":
   libs.append('i2c')
 env.Program('sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs)

system/ubloxd/SConscript

@@ -1,6 +1,6 @@
-Import('env', 'common', 'cereal', 'messaging')
+Import('env', 'common', 'cereal', 'messaging', 'socketmaster')
 
-loc_libs = [cereal, messaging, 'zmq', common, 'capnp', 'kj', 'kaitai', 'pthread']
+loc_libs = [cereal, messaging, socketmaster, 'zmq', common, 'capnp', 'kj', 'kaitai', 'pthread']
 
 if GetOption('kaitai'):
   generated = Dir('generated').srcnode().abspath