use services.h in loggerd (#1056)

* loggerd: use services.h

* don't need yaml-cpp anymore

* forgot that

old-commit-hash: 0ad5715255

SConstruct

@@ -32,7 +32,6 @@ if arch == "aarch64":
     "/data/data/com.termux/files/usr/lib",
     "/system/vendor/lib64",
     "/system/comma/usr/lib",
-    "#phonelibs/yaml-cpp/lib",
     "#phonelibs/nanovg",
     "#phonelibs/libyuv/lib",
   ]
@@ -56,7 +55,6 @@ else:
     libpath = [
       "#phonelibs/capnp-cpp/mac/lib",
       "#phonelibs/capnp-c/mac/lib",
-      "#phonelibs/yaml-cpp/mac/lib",
       "#phonelibs/libyuv/mac/lib",
       "#cereal",
       "#selfdrive/common",
@@ -67,7 +65,6 @@ else:
     libpath = [
       "#phonelibs/capnp-cpp/x64/lib",
       "#phonelibs/capnp-c/x64/lib",
-      "#phonelibs/yaml-cpp/x64/lib",
       "#phonelibs/snpe/x86_64-linux-clang",
       "#phonelibs/zmq/x64/lib",
       "#phonelibs/libyuv/x64/lib",
@@ -115,7 +112,6 @@ env = Environment(
     "#selfdrive",
     "#phonelibs/bzip2",
     "#phonelibs/libyuv/include",
-    "#phonelibs/yaml-cpp/include",
     "#phonelibs/openmax/include",
     "#phonelibs/json/src",
     "#phonelibs/json11",

phonelibs/yaml-cpp/LICENSE

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa6fcc27be034e41e21dd832f9175bfe694a48491d9e14ff0fa278e19ad14f1b
-size 1061

phonelibs/yaml-cpp/build.txt

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f10e9a2a2c9d2214c0b4adf1d4e7a1ad2d091a6b2b5afc5673bc5e5ba80b3a06
-size 172

phonelibs/yaml-cpp/include/yaml-cpp/anchor.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fec843fad67c0a1b6496992bbdc660cde5e3f59322feebe75b3fe38d48c87d18
-size 501

phonelibs/yaml-cpp/include/yaml-cpp/binary.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75ce59a8b5b9c8cb68b615fcaf7865b581d68590b7aef5b6899ac8be81d49a7e
-size 1938

phonelibs/yaml-cpp/include/yaml-cpp/contrib/anchordict.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d609c65fc3167c01117ff1b5635b94921b35b64ef4aa641e4d27ce1f4d360f0
-size 1009

phonelibs/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2891b581780c0e82e247080a416873d142a810faf92c8f29652b316616646351
-size 5258

phonelibs/yaml-cpp/include/yaml-cpp/dll.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:703de0a2406b0206ce265e6a4f7de4813796eaccdcf7f47dda326bd8dba673f5
-size 1481

phonelibs/yaml-cpp/include/yaml-cpp/emitfromevents.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2427ca0e369c8a5c597960ee14e5cfdce91ab601753fe53fe311a1863720850
-size 1670

phonelibs/yaml-cpp/include/yaml-cpp/emitter.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33bd4b8e9ea8d2634bf1f52d267c524f3f05e7faabf4ab787b65eb00d361870a
-size 7146

phonelibs/yaml-cpp/include/yaml-cpp/emitterdef.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58d709085b46f31eef29fd8074d1c6d1657d3ebd4fb393b1c06a73cef69e6e48
-size 541

phonelibs/yaml-cpp/include/yaml-cpp/emittermanip.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66dda1a31345daef7d726c0d99813e1d41f0dd2ec87fc142a573a44dbd99e07d
-size 3147

phonelibs/yaml-cpp/include/yaml-cpp/emitterstyle.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff854b2abd44bbb7c3a0f0e557068d2613e6a9dbcbf38ccd563942a7bb0ff1c2
-size 502

phonelibs/yaml-cpp/include/yaml-cpp/eventhandler.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25b82e4d8fd20b38f8c7f3e6d480543f00096d514d1d56e2e74dd4049930301e
-size 1318

phonelibs/yaml-cpp/include/yaml-cpp/exceptions.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66c388573aef22bdf78fd85a0becdce6695c86bf35b3372d12e7b705127731da
-size 9329

phonelibs/yaml-cpp/include/yaml-cpp/mark.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:069033be17c7a5875817102f3f77538431afdb7d1834a4673bad6a7267f0cab5
-size 785

phonelibs/yaml-cpp/include/yaml-cpp/node/convert.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf908acc1790290b8dcecb8011487b6df014f6643894f1839c1c9d34b29b5c73
-size 10168

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/bool_type.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31def5e52a7bd82d7f6fe3b5fbebe607316679573e1f2e768795cf5af65e83a1
-size 967

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/impl.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f990ad629f8f56e7e3e4ba493787049aafd2bb67951466879fd60f102d38ffc5
-size 5301

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/iterator.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8380485931f580085b6918288565710ba1135a22675302ce4f10ed1a269f7fbb
-size 2513

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/iterator_fwd.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e829c7f5653f0f89605321230e363467b5cfcfaece626d8728cc23d369667e62
-size 786

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/memory.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30517ab9574ef95d3a7d9e84e8706cd35a7263fc73142c9ec4b35dca049da95c
-size 1035

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/node.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9e86e7d918819dc8ab12f0e13fd902b684c21e0ebddb9cf7d90a1647d0feb2a
-size 4861

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/node_data.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:adafcaf7b487730aecb24d7d9c52fcd9a30535aa1dd3cf77d22693a2590224b4
-size 3425

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/node_iterator.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:837d6a254c4176742b829a9f5a2edf00f4c29f20ddfa0580ad0ff87a9d2befc5
-size 4864

phonelibs/yaml-cpp/include/yaml-cpp/node/detail/node_ref.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26fbb939e32d5f4237ab1712eedb3d695820de004cee2a0b2bb2d394b8dbd70b
-size 3298

phonelibs/yaml-cpp/include/yaml-cpp/node/emit.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39f35d344ba0502e05449a935c5c9fa3a0179d72b9aa2b75ee964ddd1c4a26af
-size 958

phonelibs/yaml-cpp/include/yaml-cpp/node/impl.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b6d0ab3813144e55d6e65c3ac99909f0462a46fb8c606ad769186010db05c12
-size 10672

phonelibs/yaml-cpp/include/yaml-cpp/node/iterator.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d4c6651999117c2ff840b2ee6f3411e07960b238c009401a58a41e32ecfe1c8
-size 1027

phonelibs/yaml-cpp/include/yaml-cpp/node/node.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:042445d5f475623a22450298751220b1af681e561500d925a13ca3d96a480746
-size 3724

phonelibs/yaml-cpp/include/yaml-cpp/node/parse.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eafa4476872ab20c176cf9f93341e57e7e24190a2c3864242c211bc536b97de2
-size 2084

phonelibs/yaml-cpp/include/yaml-cpp/node/ptr.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25a692e3911d8acbad980a96577259804481fb74f5602b2e5830ea9e432d819e
-size 831

phonelibs/yaml-cpp/include/yaml-cpp/node/type.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd19cd477379648c56f5640f58ac9ab2d89e8374bdd96d023dbd484492fbd480
-size 510

phonelibs/yaml-cpp/include/yaml-cpp/noncopyable.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c347a2ee75a05cfaec54176eb51f1d47c952e47d7c8508b55cb71e092ceb05af
-size 687

phonelibs/yaml-cpp/include/yaml-cpp/null.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b81505857f24e1e5940fe8c98a0ebc5aeb6a88ec8ab735dd800692d869904511
-size 790

phonelibs/yaml-cpp/include/yaml-cpp/ostream_wrapper.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2508e97879cfa632f9ccba50d22db9a1fba8a1e67637d093c7fb34c5eac77da
-size 1766

phonelibs/yaml-cpp/include/yaml-cpp/parser.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3eb3bf320e9432c83ed9b0af111ac5c8596c6d53cac4ca5d68f6105531d2b6f
-size 2189

phonelibs/yaml-cpp/include/yaml-cpp/stlemitter.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb8e241eb1f8e5cce088e560cd87bbd2b17d8fce8f944e7bcd8443ca836af5f9
-size 1457

phonelibs/yaml-cpp/include/yaml-cpp/traits.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eab217387d173d8ba0ff694bf7b80fc43d3e37a2da85ebe009fd6d6579e6be93
-size 2085

phonelibs/yaml-cpp/include/yaml-cpp/yaml.h

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:946643e99e2f865887852f838a66130c54ed770645a73f2c5f8b71b9bb2b1488
-size 795

phonelibs/yaml-cpp/lib/libyaml-cpp.a

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2adec93de45ff7175884afcef36b875d0c47d3d28f0d04c42bff825500cd4f1
-size 1277638

phonelibs/yaml-cpp/x64/lib/libyaml-cpp.a

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0429a115567270191288ad578fa2a784396216a90622eb29a9815164dcef9315
-size 1140804

release/files_common

@@ -358,10 +358,6 @@ phonelibs/SConscript
 
 phonelibs/eigen/**
 
-phonelibs/yaml-cpp/include/**
-phonelibs/yaml-cpp/lib/**
-phonelibs/yaml-cpp/LICENSE
-
 phonelibs/nanovg/*.c
 phonelibs/nanovg/*.h
 

selfdrive/loggerd/SConscript

@@ -1,7 +1,7 @@
 Import('env', 'arch', 'messaging', 'common', 'visionipc')
 
 src = ['loggerd.cc', 'logger.c']
-libs = ['zmq', 'czmq', 'capnp', 'kj', 'yaml-cpp', 'z',
+libs = ['zmq', 'czmq', 'capnp', 'kj', 'z',
   'avformat', 'avcodec', 'swscale', 'avutil',
   'yuv', 'bz2', common, 'json', messaging, visionipc]
 

selfdrive/loggerd/loggerd.cc

@@ -23,7 +23,6 @@
 #include <ftw.h>
 
 #include <zmq.h>
-#include <yaml-cpp/yaml.h>
 #include <capnp/serialize.h>
 
 #ifdef QCOM
@@ -40,6 +39,7 @@
 
 #include "logger.h"
 #include "messaging.hpp"
+#include "services.h"
 
 #ifndef QCOM
 // no encoder on PC
@@ -578,9 +578,6 @@ int main(int argc, char** argv) {
   s.ctx = Context::create();
   Poller * poller = Poller::create();
 
-  std::string exe_dir = util::dir_name(util::readlink("/proc/self/exe"));
-  std::string service_list_path = exe_dir + "/../../cereal/service_list.yaml";
-
   // subscribe to all services
 
   SubSocket *frame_sock = NULL;
@@ -589,13 +586,11 @@ int main(int argc, char** argv) {
   std::map<SubSocket*, int> qlog_counter;
   std::map<SubSocket*, int> qlog_freqs;
 
-  YAML::Node service_list = YAML::LoadFile(service_list_path);
-  for (const auto& it : service_list) {
-    auto name = it.first.as<std::string>();
-    bool should_log = it.second[1].as<bool>();
-    int qlog_freq = it.second[3] ? it.second[3].as<int>() : 0;
+  for (const auto& it : services) {
+    std::string name = it.name;
+    int qlog_freq = it.decimation ? it.decimation : 0;
 
-    if (should_log) {
+    if (it.should_log) {
       SubSocket * sock = SubSocket::create(s.ctx, name);
       assert(sock != NULL);