loggerd: move to system/ (#27534)

Author: adeebshihadeh

.github/workflows/selfdrive_tests.yaml

@@ -204,7 +204,7 @@ jobs:
                         $UNIT_TEST selfdrive/boardd && \
                         $UNIT_TEST selfdrive/controls && \
                         $UNIT_TEST selfdrive/monitoring && \
-                        $UNIT_TEST selfdrive/loggerd && \
+                        $UNIT_TEST system/loggerd && \
                         $UNIT_TEST selfdrive/car && \
                         $UNIT_TEST selfdrive/locationd && \
                         selfdrive/locationd/test/_test_locationd_lib.py && \
@@ -219,7 +219,7 @@ jobs:
                         ./common/tests/test_util && \
                         ./common/tests/test_swaglog && \
                         ./selfdrive/boardd/tests/test_boardd_usbprotocol && \
-                        ./selfdrive/loggerd/tests/test_logger &&\
+                        ./system/loggerd/tests/test_logger &&\
                         ./system/proclogd/tests/test_proclog && \
                         ./tools/replay/tests/test_replay && \
                         ./tools/cabana/tests/test_cabana && \

Jenkinsfile

@@ -157,8 +157,8 @@ pipeline {
             phone_steps("tici-common", [
               ["build", "cd selfdrive/manager && ./build.py"],
               ["test power draw", "python system/hardware/tici/test_power_draw.py"],
-              ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"],
-              ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib python selfdrive/loggerd/tests/test_encoder.py"],
+              ["test loggerd", "python system/loggerd/tests/test_loggerd.py"],
+              ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib python system/loggerd/tests/test_encoder.py"],
               ["test pigeond", "python system/sensord/tests/test_pigeond.py"],
               ["test manager", "python selfdrive/manager/test/test_manager.py"],
               ["test pandad", "python selfdrive/boardd/tests/test_pandad.py"],

SConstruct

@@ -424,7 +424,7 @@ SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript'])
 
 SConscript(['selfdrive/boardd/SConscript'])
 
-SConscript(['selfdrive/loggerd/SConscript'])
+SConscript(['system/loggerd/SConscript'])
 
 SConscript(['selfdrive/locationd/SConscript'])
 SConscript(['system/sensord/SConscript'])

docs/overview.rst

@@ -253,28 +253,28 @@ system/proclogd/main.cc
 system/proclogd/proclog.cc
 system/proclogd/proclog.h
 
-selfdrive/loggerd/.gitignore
-selfdrive/loggerd/SConscript
-selfdrive/loggerd/encoder/encoder.cc
-selfdrive/loggerd/encoder/encoder.h
-selfdrive/loggerd/encoder/v4l_encoder.cc
-selfdrive/loggerd/encoder/v4l_encoder.h
-selfdrive/loggerd/video_writer.cc
-selfdrive/loggerd/video_writer.h
-selfdrive/loggerd/logger.cc
-selfdrive/loggerd/logger.h
-selfdrive/loggerd/loggerd.cc
-selfdrive/loggerd/loggerd.h
-selfdrive/loggerd/encoderd.cc
-selfdrive/loggerd/bootlog.cc
-selfdrive/loggerd/encoder/ffmpeg_encoder.cc
-selfdrive/loggerd/encoder/ffmpeg_encoder.h
-
-selfdrive/loggerd/__init__.py
-selfdrive/loggerd/config.py
-selfdrive/loggerd/uploader.py
-selfdrive/loggerd/deleter.py
-selfdrive/loggerd/xattr_cache.py
+system/loggerd/.gitignore
+system/loggerd/SConscript
+system/loggerd/encoder/encoder.cc
+system/loggerd/encoder/encoder.h
+system/loggerd/encoder/v4l_encoder.cc
+system/loggerd/encoder/v4l_encoder.h
+system/loggerd/video_writer.cc
+system/loggerd/video_writer.h
+system/loggerd/logger.cc
+system/loggerd/logger.h
+system/loggerd/loggerd.cc
+system/loggerd/loggerd.h
+system/loggerd/encoderd.cc
+system/loggerd/bootlog.cc
+system/loggerd/encoder/ffmpeg_encoder.cc
+system/loggerd/encoder/ffmpeg_encoder.h
+
+system/loggerd/__init__.py
+system/loggerd/config.py
+system/loggerd/uploader.py
+system/loggerd/deleter.py
+system/loggerd/xattr_cache.py
 
 system/sensord/.gitignore
 system/sensord/SConscript

release/files_common

@@ -36,8 +36,8 @@
 from common.params import Params
 from common.realtime import sec_since_boot, set_core_affinity
 from system.hardware import HARDWARE, PC, AGNOS
-from selfdrive.loggerd.config import ROOT
-from selfdrive.loggerd.xattr_cache import getxattr, setxattr
+from system.loggerd.config import ROOT
+from system.loggerd.xattr_cache import getxattr, setxattr
 from selfdrive.statsd import STATS_DIR
 from system.swaglog import SWAGLOG_DIR, cloudlog
 from system.version import get_commit, get_origin, get_short_branch, get_version

selfdrive/athena/athenad.py

@@ -29,7 +29,7 @@ def manager_init() -> None:
   set_time(cloudlog)
 
   # save boot log
-  subprocess.call("./bootlog", cwd=os.path.join(BASEDIR, "selfdrive/loggerd"))
+  subprocess.call("./bootlog", cwd=os.path.join(BASEDIR, "system/loggerd"))
 
   params = Params()
   params.clear_all(ParamKeyType.CLEAR_ON_MANAGER_START)

selfdrive/manager/manager.py

@@ -34,8 +34,8 @@ def ublox(started, params, CP: car.CarParams) -> bool:
 
   DaemonProcess("manage_athenad", "selfdrive.athena.manage_athenad", "AthenadPid"),
   NativeProcess("dmonitoringmodeld", "selfdrive/modeld", ["./dmonitoringmodeld"], enabled=(not PC or WEBCAM), callback=driverview),
-  NativeProcess("encoderd", "selfdrive/loggerd", ["./encoderd"]),
-  NativeProcess("loggerd", "selfdrive/loggerd", ["./loggerd"], onroad=False, callback=logging),
+  NativeProcess("encoderd", "system/loggerd", ["./encoderd"]),
+  NativeProcess("loggerd", "system/loggerd", ["./loggerd"], onroad=False, callback=logging),
   NativeProcess("modeld", "selfdrive/modeld", ["./modeld"]),
   NativeProcess("mapsd", "selfdrive/navd", ["./map_renderer"], enabled=False),
   NativeProcess("navmodeld", "selfdrive/modeld", ["./navmodeld"], enabled=False),
@@ -47,7 +47,7 @@ def ublox(started, params, CP: car.CarParams) -> bool:
   PythonProcess("calibrationd", "selfdrive.locationd.calibrationd"),
   PythonProcess("torqued", "selfdrive.locationd.torqued"),
   PythonProcess("controlsd", "selfdrive.controls.controlsd"),
-  PythonProcess("deleter", "selfdrive.loggerd.deleter", offroad=True),
+  PythonProcess("deleter", "system.loggerd.deleter", offroad=True),
   PythonProcess("dmonitoringd", "selfdrive.monitoring.dmonitoringd", enabled=(not PC or WEBCAM), callback=driverview),
   PythonProcess("laikad", "selfdrive.locationd.laikad"),
   PythonProcess("rawgpsd", "system.sensord.rawgps.rawgpsd", enabled=TICI),
@@ -61,7 +61,7 @@ def ublox(started, params, CP: car.CarParams) -> bool:
   PythonProcess("thermald", "selfdrive.thermald.thermald", offroad=True),
   PythonProcess("tombstoned", "selfdrive.tombstoned", enabled=not PC, offroad=True),
   PythonProcess("updated", "selfdrive.updated", enabled=not PC, onroad=False, offroad=True),
-  PythonProcess("uploader", "selfdrive.loggerd.uploader", offroad=True),
+  PythonProcess("uploader", "system.loggerd.uploader", offroad=True),
   PythonProcess("statsd", "selfdrive.statsd", offroad=True),
 
   # debug procs

selfdrive/manager/process_config.py

@@ -13,7 +13,7 @@
 from system.hardware import HARDWARE
 from common.file_helpers import atomic_write_in_dir
 from system.version import get_normalized_origin, get_short_branch, get_short_version, is_dirty
-from selfdrive.loggerd.config import STATS_DIR, STATS_DIR_FILE_LIMIT, STATS_SOCKET, STATS_FLUSH_TIME_S
+from system.loggerd.config import STATS_DIR, STATS_DIR_FILE_LIMIT, STATS_SOCKET, STATS_FLUSH_TIME_S
 
 
 class METRIC_TYPE:

selfdrive/statsd.py

@@ -15,7 +15,7 @@
 from common.timeout import Timeout
 from common.params import Params
 from selfdrive.controls.lib.events import EVENTS, ET
-from selfdrive.loggerd.config import ROOT
+from system.loggerd.config import ROOT
 from selfdrive.test.helpers import set_params_enabled, release_only
 from tools.lib.logreader import LogReader
 

selfdrive/test/test_onroad.py

@@ -18,7 +18,7 @@
 from common.realtime import DT_TRML, sec_since_boot
 from selfdrive.controls.lib.alertmanager import set_offroad_alert
 from system.hardware import HARDWARE, TICI, AGNOS
-from selfdrive.loggerd.config import get_available_percent
+from system.loggerd.config import get_available_percent
 from selfdrive.statsd import statlog
 from system.swaglog import cloudlog
 from selfdrive.thermald.power_monitoring import PowerMonitoring

selfdrive/thermald/thermald.py

@@ -10,7 +10,7 @@
 from typing import NoReturn
 
 from common.file_helpers import mkdirs_exists_ok
-from selfdrive.loggerd.config import ROOT
+from system.loggerd.config import ROOT
 import selfdrive.sentry as sentry
 from system.swaglog import cloudlog
 from system.version import get_commit

selfdrive/tombstoned.py

@@ -3,7 +3,7 @@
 
 #include "cereal/messaging/messaging.h"
 #include "common/swaglog.h"
-#include "selfdrive/loggerd/logger.h"
+#include "system/loggerd/logger.h"
 
 
 static kj::Array<capnp::word> build_boot_log() {

selfdrive/loggerd/.gitignore renamed to system/loggerd/.gitignore

@@ -3,8 +3,8 @@
 import shutil
 import threading
 from system.swaglog import cloudlog
-from selfdrive.loggerd.config import ROOT, get_available_bytes, get_available_percent
-from selfdrive.loggerd.uploader import listdir_by_creation
+from system.loggerd.config import ROOT, get_available_bytes, get_available_percent
+from system.loggerd.uploader import listdir_by_creation
 
 MIN_BYTES = 5 * 1024 * 1024 * 1024
 MIN_PERCENT = 10

selfdrive/loggerd/README.md renamed to system/loggerd/README.md

@@ -1,5 +1,5 @@
 #include <cassert>
-#include "selfdrive/loggerd/encoder/encoder.h"
+#include "system/loggerd/encoder/encoder.h"
 
 VideoEncoder::~VideoEncoder() {}
 

selfdrive/loggerd/SConscript renamed to system/loggerd/SConscript

@@ -7,7 +7,7 @@
 #include "cereal/messaging/messaging.h"
 #include "cereal/visionipc/visionipc.h"
 #include "common/queue.h"
-#include "selfdrive/loggerd/video_writer.h"
+#include "system/loggerd/video_writer.h"
 #include "system/camerad/cameras/camera_common.h"
 
 #define V4L2_BUF_FLAG_KEYFRAME 8

selfdrive/loggerd/__init__.py renamed to system/loggerd/__init__.py

@@ -1,6 +1,6 @@
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
-#include "selfdrive/loggerd/encoder/ffmpeg_encoder.h"
+#include "system/loggerd/encoder/ffmpeg_encoder.h"
 
 #include <fcntl.h>
 #include <unistd.h>

selfdrive/loggerd/bootlog.cc renamed to system/loggerd/bootlog.cc

@@ -11,8 +11,8 @@ extern "C" {
 #include <libavutil/imgutils.h>
 }
 
-#include "selfdrive/loggerd/encoder/encoder.h"
-#include "selfdrive/loggerd/loggerd.h"
+#include "system/loggerd/encoder/encoder.h"
+#include "system/loggerd/loggerd.h"
 
 class FfmpegEncoder : public VideoEncoder {
  public:

selfdrive/loggerd/config.py renamed to system/loggerd/config.py

@@ -2,7 +2,7 @@
 #include <sys/ioctl.h>
 #include <poll.h>
 
-#include "selfdrive/loggerd/encoder/v4l_encoder.h"
+#include "system/loggerd/encoder/v4l_encoder.h"
 #include "common/util.h"
 #include "common/timing.h"
 

selfdrive/loggerd/deleter.py renamed to system/loggerd/deleter.py

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "common/queue.h"
-#include "selfdrive/loggerd/encoder/encoder.h"
+#include "system/loggerd/encoder/encoder.h"
 
 #define BUF_IN_COUNT 7
 #define BUF_OUT_COUNT 6

selfdrive/loggerd/encoder/encoder.cc renamed to system/loggerd/encoder/encoder.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/loggerd/loggerd.h"
+#include "system/loggerd/loggerd.h"
 
 ExitHandler do_exit;
 

selfdrive/loggerd/encoder/encoder.h renamed to system/loggerd/encoder/encoder.h

@@ -1,4 +1,4 @@
-#include "selfdrive/loggerd/logger.h"
+#include "system/loggerd/logger.h"
 
 #include <sys/stat.h>
 #include <unistd.h>

selfdrive/loggerd/encoder/ffmpeg_encoder.cc renamed to system/loggerd/encoder/ffmpeg_encoder.cc

@@ -1,5 +1,5 @@
-#include "selfdrive/loggerd/loggerd.h"
-#include "selfdrive/loggerd/video_writer.h"
+#include "system/loggerd/loggerd.h"
+#include "system/loggerd/video_writer.h"
 
 ExitHandler do_exit;
 

selfdrive/loggerd/encoder/ffmpeg_encoder.h renamed to system/loggerd/encoder/ffmpeg_encoder.h

@@ -23,13 +23,13 @@
 #include "common/util.h"
 #include "system/hardware/hw.h"
 
-#include "selfdrive/loggerd/encoder/encoder.h"
-#include "selfdrive/loggerd/logger.h"
+#include "system/loggerd/encoder/encoder.h"
+#include "system/loggerd/logger.h"
 #ifdef QCOM2
-#include "selfdrive/loggerd/encoder/v4l_encoder.h"
+#include "system/loggerd/encoder/v4l_encoder.h"
 #define Encoder V4LEncoder
 #else
-#include "selfdrive/loggerd/encoder/ffmpeg_encoder.h"
+#include "system/loggerd/encoder/ffmpeg_encoder.h"
 #define Encoder FfmpegEncoder
 #endif
 

selfdrive/loggerd/encoder/v4l_encoder.cc renamed to system/loggerd/encoder/v4l_encoder.cc

@@ -3,8 +3,8 @@
 
 import os
 
-from selfdrive.loggerd.config import ROOT, get_available_percent
-from selfdrive.loggerd.tests.loggerd_tests_common import create_random_file
+from system.loggerd.config import ROOT, get_available_percent
+from system.loggerd.tests.loggerd_tests_common import create_random_file
 
 
 if __name__ == "__main__":

selfdrive/loggerd/encoder/v4l_encoder.h renamed to system/loggerd/encoder/v4l_encoder.h

@@ -5,7 +5,7 @@
 import tempfile
 import unittest
 
-import selfdrive.loggerd.uploader as uploader
+import system.loggerd.uploader as uploader
 
 def create_random_file(file_path, size_mb, lock=False):
   try:

selfdrive/loggerd/encoderd.cc renamed to system/loggerd/encoderd.cc

@@ -6,8 +6,8 @@
 from collections import namedtuple
 
 from common.timeout import Timeout, TimeoutException
-import selfdrive.loggerd.deleter as deleter
-from selfdrive.loggerd.tests.loggerd_tests_common import UploaderTestCase
+import system.loggerd.deleter as deleter
+from system.loggerd.tests.loggerd_tests_common import UploaderTestCase
 
 Stats = namedtuple("Stats", ['f_bavail', 'f_blocks', 'f_frsize'])
 

selfdrive/loggerd/logger.cc renamed to system/loggerd/logger.cc

@@ -14,7 +14,7 @@
 from common.params import Params
 from common.timeout import Timeout
 from system.hardware import TICI
-from selfdrive.loggerd.config import ROOT
+from system.loggerd.config import ROOT
 from selfdrive.manager.process_config import managed_processes
 from tools.lib.logreader import LogReader
 

selfdrive/loggerd/logger.h renamed to system/loggerd/logger.h

@@ -9,7 +9,7 @@
 #include "catch2/catch.hpp"
 #include "cereal/messaging/messaging.h"
 #include "common/util.h"
-#include "selfdrive/loggerd/logger.h"
+#include "system/loggerd/logger.h"
 #include "tools/replay/util.h"
 
 typedef cereal::Sentinel::SentinelType SentinelType;

selfdrive/loggerd/loggerd.cc renamed to system/loggerd/loggerd.cc

@@ -15,7 +15,7 @@
 from common.basedir import BASEDIR
 from common.params import Params
 from common.timeout import Timeout
-from selfdrive.loggerd.config import ROOT
+from system.loggerd.config import ROOT
 from selfdrive.manager.process_config import managed_processes
 from system.version import get_version
 from tools.lib.logreader import LogReader
@@ -51,7 +51,7 @@ def _get_log_fn(self, x):
 
   def _gen_bootlog(self):
     with Timeout(5):
-      out = subprocess.check_output("./bootlog", cwd=os.path.join(BASEDIR, "selfdrive/loggerd"), encoding='utf-8')
+      out = subprocess.check_output("./bootlog", cwd=os.path.join(BASEDIR, "system/loggerd"), encoding='utf-8')
 
     log_fn = self._get_log_fn(out)
 

selfdrive/loggerd/loggerd.h renamed to system/loggerd/loggerd.h

@@ -7,9 +7,9 @@
 import json
 
 from system.swaglog import cloudlog
-import selfdrive.loggerd.uploader as uploader
+import system.loggerd.uploader as uploader
 
-from selfdrive.loggerd.tests.loggerd_tests_common import UploaderTestCase
+from system.loggerd.tests.loggerd_tests_common import UploaderTestCase
 
 
 class TestLogHandler(logging.Handler):

selfdrive/loggerd/tests/__init__.py renamed to system/loggerd/tests/__init__.py

@@ -1,7 +1,7 @@
 import os
-from selfdrive.loggerd.uploader import UPLOAD_ATTR_NAME, UPLOAD_ATTR_VALUE
+from system.loggerd.uploader import UPLOAD_ATTR_NAME, UPLOAD_ATTR_VALUE
 
-from selfdrive.loggerd.config import ROOT
+from system.loggerd.config import ROOT
 for folder in os.walk(ROOT):
   for file1 in folder[2]:
     full_path = os.path.join(folder[0], file1)

selfdrive/loggerd/tests/fill_eon.py renamed to system/loggerd/tests/fill_eon.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import os
 import sys
-from selfdrive.loggerd.uploader import UPLOAD_ATTR_NAME
+from system.loggerd.uploader import UPLOAD_ATTR_NAME
 
 for fn in sys.argv[1:]:
   print(f"unmarking {fn}")