commit 4850772a4b845d9872e306c981a71967f1e599f8
author Austin Schuh <austin.schuh@bluerivertech.com> Sat Jul 17 17:29:24 2021 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Mon Jul 19 12:02:31 2021 -0700
tree cb1d6df7d4bf0a3e7679191e50a6368e6442833c
parent 39db3d68f302c408fc42e695f0f0e9c638608c05

Add node_boots parsing from log file headers

Jim suggested that we could store the boot UUID in the header for all
the nodes rather than per message.  That seems reasonable and lets us do
other things with it in the future.  Use it when available to determine
which boot happens when.

When we only have 1 boot for a node, fall back to setting the boot count
to 0 for sorting.  This lets us get started with the new boot counter.

A follow-up commit will start logging with this.

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

aos/events/logging/logfile_utils.h

diff --git a/aos/events/logging/logfile_utils.h b/aos/events/logging/logfile_utils.h
index f876d25..f31f4df 100644
--- a/aos/events/logging/logfile_utils.h
+++ b/aos/events/logging/logfile_utils.h
@@ -334,10 +334,19 @@
   // Note: reading the next message may change the max_out_of_order_duration().
   std::optional<SizePrefixedFlatbufferVector<MessageHeader>> ReadMessage();
 
+  // Returns the boot count for the requested node, or std::nullopt if we don't
+  // know.
+  std::optional<size_t> boot_count(size_t node_index) const {
+    CHECK_GE(node_index, 0u);
+    CHECK_LT(node_index, boot_counts_.size());
+    return boot_counts_[node_index];
+  }
+
  private:
   // Opens the next log and updates message_reader_.  Sets done_ if there is
   // nothing more to do.
   void NextLog();
+  void ComputeBootCounts();
 
   const LogParts parts_;
   size_t next_part_index_ = 1u;
@@ -354,6 +363,9 @@
   bool after_start_ = false;
 
   monotonic_clock::time_point newest_timestamp_ = monotonic_clock::min_time;
+
+  // Per node boot counts.
+  std::vector<std::optional<size_t>> boot_counts_;
 };
 
 // Struct to hold a message as it gets sorted on a single node.
@@ -365,6 +377,11 @@
   // The local timestamp.
   BootTimestamp timestamp;
 
+  // Remote boot when this is a timestamp.
+  size_t monotonic_remote_boot = 0xffffff;
+
+  size_t monotonic_timestamp_boot = 0xffffff;
+
   // The data (either a timestamp header, or a data header).
   SizePrefixedFlatbufferVector<MessageHeader> data;
 
@@ -437,6 +454,10 @@
   // Set used for efficient sorting of messages.  We can benchmark and evaluate
   // other data structures if this proves to be the bottleneck.
   absl::btree_set<Message> messages_;
+
+  // Mapping from channel to source node.
+  // TODO(austin): Should we put this in Boots so it can be cached for everyone?
+  std::vector<size_t> source_node_index_;
 };
 
 // Class to run merge sort on the messages from multiple LogPartsSorter