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/logging/logger_test.cc

diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index d6ad8fe..195d442 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -1466,8 +1466,8 @@
   // TODO(austin): Negate...
   const chrono::nanoseconds initial_pi2_offset = chrono::seconds(1000);
 
-  time_converter_.AddMonotonic({monotonic_clock::epoch(),
-                                monotonic_clock::epoch() + initial_pi2_offset});
+  time_converter_.AddMonotonic(
+      {BootTimestamp::epoch(), BootTimestamp::epoch() + initial_pi2_offset});
   // Wait for 95 ms, (~0.1 seconds - 1/2 of the ping/pong period), and set the
   // skew to be 200 uS/s
   const chrono::nanoseconds startup_sleep1 = time_converter_.AddMonotonic(
@@ -2169,8 +2169,8 @@
 // up a clock difference between 2 nodes and looking at the resulting parts.
 TEST_P(MultinodeLoggerTest, LoggerStartTime) {
   time_converter_.AddMonotonic(
-      {monotonic_clock::epoch(),
-       monotonic_clock::epoch() + chrono::seconds(1000)});
+      {BootTimestamp::epoch(),
+       BootTimestamp::epoch() + chrono::seconds(1000)});
   {
     LoggerState pi1_logger = MakeLogger(pi1_);
     LoggerState pi2_logger = MakeLogger(pi2_);
@@ -2208,8 +2208,8 @@
   util::UnlinkRecursive(tmp_dir_ + "/renamefolder");
   util::UnlinkRecursive(tmp_dir_ + "/new-good");
   time_converter_.AddMonotonic(
-      {monotonic_clock::epoch(),
-       monotonic_clock::epoch() + chrono::seconds(1000)});
+      {BootTimestamp::epoch(),
+       BootTimestamp::epoch() + chrono::seconds(1000)});
   logfile_base1_ = tmp_dir_ + "/renamefolder/multi_logfile1";
   logfile_base2_ = tmp_dir_ + "/renamefolder/multi_logfile2";
   logfiles_ = MakeLogFiles(logfile_base1_, logfile_base2_);
@@ -2234,8 +2234,8 @@
 // Test that renaming the file base dies.
 TEST_P(MultinodeLoggerDeathTest, LoggerRenameFile) {
   time_converter_.AddMonotonic(
-      {monotonic_clock::epoch(),
-       monotonic_clock::epoch() + chrono::seconds(1000)});
+      {BootTimestamp::epoch(),
+       BootTimestamp::epoch() + chrono::seconds(1000)});
   util::UnlinkRecursive(tmp_dir_ + "/renamefile");
   logfile_base1_ = tmp_dir_ + "/renamefile/multi_logfile1";
   logfile_base2_ = tmp_dir_ + "/renamefile/multi_logfile2";
@@ -2413,8 +2413,8 @@
 TEST_P(MultinodeLoggerTest, OneDirectionWithNegativeSlope) {
   event_loop_factory_.GetNodeEventLoopFactory(pi1_)->Disconnect(pi2_);
   time_converter_.AddMonotonic(
-      {monotonic_clock::epoch(),
-       monotonic_clock::epoch() + chrono::seconds(1000)});
+      {BootTimestamp::epoch(),
+       BootTimestamp::epoch() + chrono::seconds(1000)});
 
   time_converter_.AddMonotonic(
       {chrono::milliseconds(10000),
@@ -2439,8 +2439,8 @@
 TEST_P(MultinodeLoggerTest, OneDirectionWithPositiveSlope) {
   event_loop_factory_.GetNodeEventLoopFactory(pi1_)->Disconnect(pi2_);
   time_converter_.AddMonotonic(
-      {monotonic_clock::epoch(),
-       monotonic_clock::epoch() + chrono::seconds(500)});
+      {BootTimestamp::epoch(),
+       BootTimestamp::epoch() + chrono::seconds(500)});
 
   time_converter_.AddMonotonic(
       {chrono::milliseconds(10000),
@@ -2466,8 +2466,8 @@
   event_loop_factory_.GetNodeEventLoopFactory(pi1_)->Disconnect(pi2_);
   event_loop_factory_.GetNodeEventLoopFactory(pi2_)->Disconnect(pi1_);
   time_converter_.AddMonotonic(
-      {monotonic_clock::epoch(),
-       monotonic_clock::epoch() + chrono::seconds(1000)});
+      {BootTimestamp::epoch(),
+       BootTimestamp::epoch() + chrono::seconds(1000)});
   {
     LoggerState pi1_logger = MakeLogger(pi1_);