commit 24bf4975587d1219a28e6a53a7e72a5cf88cb789
author Austin Schuh <austin.schuh@bluerivertech.com> Tue Jun 29 22:09:08 2021 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Tue Jun 29 22:11:52 2021 -0700
tree af9f15497c5a111c4d07e298af3011231ab48435
parent 715adc163b3d6918b5a5c4f033459a8a0c979386

Replace TimestampMapper::sorted_until with started()

Rebooting nodes will make sorted_until a pretty meaningless concept
since time can go backwards at the outer level of sorting.  The
only user (outside tests) is just using it to detect if sorting
has started.  Present that simpler interface instead to make the
contract easier to adhere to going forwards.

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

aos/events/logging/logfile_utils_test.cc

diff --git a/aos/events/logging/logfile_utils_test.cc b/aos/events/logging/logfile_utils_test.cc
index cdbc332..dc491c1 100644
--- a/aos/events/logging/logfile_utils_test.cc
+++ b/aos/events/logging/logfile_utils_test.cc
@@ -839,7 +839,7 @@
     EXPECT_EQ(mapper1_count, 0u);
     output0.emplace_back(std::move(*mapper0.Front()));
     mapper0.PopFront();
-    EXPECT_EQ(mapper0.sorted_until(), e + chrono::milliseconds(1900));
+    EXPECT_TRUE(mapper0.started());
     EXPECT_EQ(mapper0_count, 1u);
     EXPECT_EQ(mapper1_count, 0u);
 
@@ -848,12 +848,12 @@
     EXPECT_EQ(mapper1_count, 0u);
     output0.emplace_back(std::move(*mapper0.Front()));
     mapper0.PopFront();
-    EXPECT_EQ(mapper0.sorted_until(), e + chrono::milliseconds(2900));
+    EXPECT_TRUE(mapper0.started());
 
     ASSERT_TRUE(mapper0.Front() != nullptr);
     output0.emplace_back(std::move(*mapper0.Front()));
     mapper0.PopFront();
-    EXPECT_EQ(mapper0.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper0.started());
 
     EXPECT_EQ(mapper0_count, 3u);
     EXPECT_EQ(mapper1_count, 0u);
@@ -880,8 +880,7 @@
     EXPECT_EQ(mapper1_count, 1u);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(1900));
+    EXPECT_TRUE(mapper1.started());
     EXPECT_EQ(mapper0_count, 3u);
     EXPECT_EQ(mapper1_count, 1u);
 
@@ -890,13 +889,12 @@
     EXPECT_EQ(mapper1_count, 2u);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(2900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper1.started());
 
     EXPECT_EQ(mapper0_count, 3u);
     EXPECT_EQ(mapper1_count, 3u);
@@ -1071,19 +1069,17 @@
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(1900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(2900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() == nullptr);
 
@@ -1104,17 +1100,17 @@
     ASSERT_TRUE(mapper0.Front() != nullptr);
     output0.emplace_back(std::move(*mapper0.Front()));
     mapper0.PopFront();
-    EXPECT_EQ(mapper0.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper0.started());
 
     ASSERT_TRUE(mapper0.Front() != nullptr);
     output0.emplace_back(std::move(*mapper0.Front()));
     mapper0.PopFront();
-    EXPECT_EQ(mapper0.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper0.started());
 
     ASSERT_TRUE(mapper0.Front() != nullptr);
     output0.emplace_back(std::move(*mapper0.Front()));
     mapper0.PopFront();
-    EXPECT_EQ(mapper0.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper0.started());
 
     ASSERT_TRUE(mapper0.Front() == nullptr);
 
@@ -1179,19 +1175,17 @@
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(1900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(2900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() == nullptr);
 
@@ -1259,19 +1253,17 @@
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(1900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(),
-              e + chrono::seconds(100) + chrono::milliseconds(2900));
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() != nullptr);
     output1.emplace_back(std::move(*mapper1.Front()));
     mapper1.PopFront();
-    EXPECT_EQ(mapper1.sorted_until(), monotonic_clock::max_time);
+    EXPECT_TRUE(mapper1.started());
 
     ASSERT_TRUE(mapper1.Front() == nullptr);