commit c3f34d1554ec815fb3eedc3323a70767fd98cc0b
author James Kuszmaul <james.kuszmaul@bluerivertech.com> Mon Aug 15 15:57:55 2022 -0700
committer James Kuszmaul <james.kuszmaul@bluerivertech.com> Mon Aug 15 16:06:57 2022 -0700
tree 287699c946cb4175e2aa6d8552775a07c7192894
parent 363dc83cd269ba06cda2f8edb8db9162c184cffa

Update name of LogReader::State::SetClockOffset

Also, run clang-format.

Change-Id: Icc9c689bc4d9c9abaf1962aab46389c56713b29c
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/events/logging/log_reader.cc

diff --git a/aos/events/logging/log_reader.cc b/aos/events/logging/log_reader.cc
index b2d0ed9..87ad72c 100644
--- a/aos/events/logging/log_reader.cc
+++ b/aos/events/logging/log_reader.cc
@@ -1226,7 +1226,7 @@
           next_time + std::chrono::duration_cast<std::chrono::nanoseconds>(
                           std::chrono::duration<double>(
                               FLAGS_threaded_look_ahead_seconds)));
-      state->SetClockOffset();
+      state->MaybeSetClockOffset();
       state->Setup(next_time.time);
       state->SetupStartupTimer();
     });
@@ -2235,7 +2235,7 @@
   }
 }
 
-void LogReader::State::SetClockOffset() {
+void LogReader::State::MaybeSetClockOffset() {
   if (node_event_loop_factory_ == nullptr) {
     // If not running with simulated event loop, set the monotonic clock
     // offset.

aos/events/logging/log_reader.h

diff --git a/aos/events/logging/log_reader.h b/aos/events/logging/log_reader.h
index 04d2888..9e44996 100644
--- a/aos/events/logging/log_reader.h
+++ b/aos/events/logging/log_reader.h
@@ -3,11 +3,12 @@
 
 #include <chrono>
 #include <deque>
-#include <string_view>
 #include <queue>
+#include <string_view>
 #include <tuple>
 #include <vector>
 
+#include "aos/condition.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/logfile_sorting.h"
 #include "aos/events/logging/logfile_utils.h"
@@ -15,15 +16,14 @@
 #include "aos/events/logging/replay_timing_generated.h"
 #include "aos/events/shm_event_loop.h"
 #include "aos/events/simulated_event_loop.h"
+#include "aos/mutex/mutex.h"
 #include "aos/network/message_bridge_server_generated.h"
 #include "aos/network/multinode_timestamp_filter.h"
 #include "aos/network/remote_message_generated.h"
 #include "aos/network/timestamp_filter.h"
 #include "aos/time/time.h"
-#include "aos/uuid.h"
 #include "aos/util/threaded_queue.h"
-#include "aos/mutex/mutex.h"
-#include "aos/condition.h"
+#include "aos/uuid.h"
 #include "flatbuffers/flatbuffers.h"
 
 namespace aos {
@@ -540,7 +540,7 @@
     // Sends a buffer on the provided channel index.
     bool Send(const TimestampedMessage &timestamped_message);
 
-    void SetClockOffset();
+    void MaybeSetClockOffset();
     std::chrono::nanoseconds clock_offset() const { return clock_offset_; }
 
     // Returns a debug string for the channel merger.
@@ -584,9 +584,8 @@
     void QueueThreadUntil(BootTimestamp time);
 
    private:
-    void TrackMessageSendTiming(
-        const RawSender &sender,
-        monotonic_clock::time_point expected_send_time);
+    void TrackMessageSendTiming(const RawSender &sender,
+                                monotonic_clock::time_point expected_send_time);
     void SendMessageTimings();
     // Log file.
     std::unique_ptr<TimestampMapper> timestamp_mapper_;