From fecdf16f6bd729dadf35053e4dcde39cae9cb73e Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 2 Aug 2021 17:21:12 +0800 Subject: [PATCH] logger.cc/logger_build_init_data(): reuse params_map (#21811) * faster log params * Update selfdrive/loggerd/logger.cc * fix build Co-authored-by: Willem Melching --- selfdrive/loggerd/logger.cc | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/selfdrive/loggerd/logger.cc b/selfdrive/loggerd/logger.cc index 8651530b47..84713d654a 100644 --- a/selfdrive/loggerd/logger.cc +++ b/selfdrive/loggerd/logger.cc @@ -94,22 +94,23 @@ kj::Array logger_build_init_data() { init.setDirty(!getenv("CLEAN")); // log params - Params params = Params(); - init.setGitCommit(params.get("GitCommit")); - init.setGitBranch(params.get("GitBranch")); - init.setGitRemote(params.get("GitRemote")); + auto params = Params(); + std::map params_map = params.readAll(); + + init.setGitCommit(params_map["GitCommit"]); + init.setGitBranch(params_map["GitBranch"]); + init.setGitRemote(params_map["GitRemote"]); init.setPassive(params.getBool("Passive")); - init.setDongleId(params.get("DongleId")); - { - std::map params_map = params.readAll(); - auto lparams = init.initParams().initEntries(params_map.size()); - int i = 0; - for (auto& kv : params_map) { - auto lentry = lparams[i]; - lentry.setKey(kv.first); - lentry.setValue(capnp::Data::Reader((const kj::byte*)kv.second.data(), kv.second.size())); - i++; - } + init.setDongleId(params_map["DongleId"]); + + auto lparams = init.initParams().initEntries(params_map.size()); + int i = 0; + for (auto& [key, value] : params_map) { + auto lentry = lparams[i]; + lentry.setKey(key); + lentry.setValue(capnp::Data::Reader((const kj::byte*)value.data(), value.size())); + i++; + } return capnp::messageToFlatArray(msg); }