commit 661688497b98b569e7797ee199a34e60cdcfd22a
author Austin Schuh <austin.schuh@bluerivertech.com> Tue Aug 17 19:42:21 2021 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Fri Aug 20 19:27:24 2021 -0700
tree 005b7c6fcb210974af2377c18ede5c9988648e3b
parent 5b728b79162b4e75ea9c64227a258efb4975fb3f

Estimate the distributed clock with boots accounted for

Route the current boot through both the noncausal filter, and the
timestamp solver code.  This gets us 1 step closer to exposing boots
to the user.

This stops before changing log_reader though.  We still CHECK on the way
into the SimulatedEventLoopFactory that actually runs reading.  This
felt like a reasonable intermediate point.

Change-Id: I85d0735c449a2aacf8cc457bdbcdbd667f1809ef
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>

aos/events/simulated_event_loop_test.cc

diff --git a/aos/events/simulated_event_loop_test.cc b/aos/events/simulated_event_loop_test.cc
index 4cb51de..83568da 100644
--- a/aos/events/simulated_event_loop_test.cc
+++ b/aos/events/simulated_event_loop_test.cc
@@ -73,10 +73,10 @@
 }
 
 INSTANTIATE_TEST_SUITE_P(SimulatedEventLoopCommonTest, AbstractEventLoopTest,
-                        CommonParameters());
+                         CommonParameters());
 
 INSTANTIATE_TEST_SUITE_P(SimulatedEventLoopCommonDeathTest,
-                        AbstractEventLoopDeathTest, CommonParameters());
+                         AbstractEventLoopDeathTest, CommonParameters());
 
 // Parameters to run all the tests with.
 struct Param {
@@ -785,8 +785,8 @@
   constexpr chrono::milliseconds kOffset{1501};
   time.AddNextTimestamp(
       distributed_clock::epoch(),
-      {monotonic_clock::epoch(), monotonic_clock::epoch() + kOffset,
-       monotonic_clock::epoch()});
+      {logger::BootTimestamp::epoch(), logger::BootTimestamp::epoch() + kOffset,
+       logger::BootTimestamp::epoch()});
 
   std::unique_ptr<EventLoop> ping_event_loop =
       simulated_event_loop_factory.MakeEventLoop("ping", pi1);
@@ -1293,13 +1293,13 @@
   constexpr chrono::milliseconds kOffset{150100};
   time.AddNextTimestamp(
       distributed_clock::epoch(),
-      {monotonic_clock::epoch(), monotonic_clock::epoch() + kOffset,
-       monotonic_clock::epoch()});
+      {logger::BootTimestamp::epoch(), logger::BootTimestamp::epoch() + kOffset,
+       logger::BootTimestamp::epoch()});
   time.AddNextTimestamp(
       distributed_clock::epoch() + chrono::seconds(10),
-      {monotonic_clock::epoch() + chrono::milliseconds(9999),
-       monotonic_clock::epoch() + kOffset + chrono::seconds(10),
-       monotonic_clock::epoch() + chrono::milliseconds(9999)});
+      {logger::BootTimestamp::epoch() + chrono::milliseconds(9999),
+       logger::BootTimestamp::epoch() + kOffset + chrono::seconds(10),
+       logger::BootTimestamp::epoch() + chrono::milliseconds(9999)});
 
   std::unique_ptr<EventLoop> ping_event_loop =
       simulated_event_loop_factory.MakeEventLoop("ping", pi1);