From f71bf839468aa119c41e5d99948a8f107fed047b Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 4 Jan 2021 18:33:35 +0800 Subject: [PATCH] refactor qlog_counter (#19626) old-commit-hash: 041fbbf7259a62e375d900f2eece309782b52411 --- selfdrive/loggerd/loggerd.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/selfdrive/loggerd/loggerd.cc b/selfdrive/loggerd/loggerd.cc index 8dd328df70..f2166fe393 100644 --- a/selfdrive/loggerd/loggerd.cc +++ b/selfdrive/loggerd/loggerd.cc @@ -583,8 +583,10 @@ int main(int argc, char** argv) { std::vector socks; - std::map qlog_counter; - std::map qlog_freqs; + typedef struct QlogState { + int counter, freq; + } QlogState; + std::map qlog_states; for (const auto& it : services) { std::string name = it.name; @@ -598,9 +600,8 @@ int main(int argc, char** argv) { for (int cid=0;cid<=MAX_CAM_IDX;cid++) { if (name == cameras_logged[cid].frame_packet_name) { s.rotate_state[cid].fpkt_sock = sock; } } - - qlog_counter[sock] = (it.decimation == -1) ? -1 : 0; - qlog_freqs[sock] = it.decimation; + qlog_states[sock] = {.counter = (it.decimation == -1) ? -1 : 0, + .freq = it.decimation}; } } @@ -650,12 +651,12 @@ int main(int argc, char** argv) { delete last_msg; last_msg = msg; - logger_log(&s.logger, (uint8_t*)msg->getData(), msg->getSize(), qlog_counter[sock] == 0); + QlogState& qs = qlog_states[sock]; + logger_log(&s.logger, (uint8_t*)msg->getData(), msg->getSize(), qs.counter == 0); - if (qlog_counter[sock] != -1) { + if (qs.counter != -1) { //printf("%p: %d/%d\n", socks[i], qlog_counter[socks[i]], qlog_freqs[socks[i]]); - qlog_counter[sock]++; - qlog_counter[sock] %= qlog_freqs[sock]; + qs.counter = (qs.counter + 1) % qs.freq; } bytes_count += msg->getSize(); msg_count++;