commit bed2af0dfea3ef0aaab9b3cd59e2e2efc1229b22
author James Kuszmaul <jabukuszmaul@gmail.com> Sat Jan 28 15:57:24 2023 -0800
committer James Kuszmaul <jabukuszmaul@gmail.com> Sat Jan 28 16:39:59 2023 -0800
tree d3ebf13c46a65ae230d6eab4bae9071e3074c1c5
parent 31ebde8b77388f2adb7fb4d0337c1682bf00fbbd

Fix handling of special channels in log_to_mcap

Because RegisterWithoutStarting starts the clocks at 0.0, and because
the various options for creating startup handlers didn't obviously help
in this situation, fix the special configuration and timestamp channels
to not produce messages at t=0.0.

Change-Id: Ifaab480c7f37a6b9fea0317d3a5a529bdb3c3c86
Signed-off-by: James Kuszmaul <jabukuszmaul@gmail.com>

aos/util/log_to_mcap.cc

diff --git a/aos/util/log_to_mcap.cc b/aos/util/log_to_mcap.cc
index a94473e..38a3be7 100644
--- a/aos/util/log_to_mcap.cc
+++ b/aos/util/log_to_mcap.cc
@@ -51,7 +51,7 @@
   if (FLAGS_include_clocks) {
     aos::logger::LogReader config_reader(logfiles);
 
-    const aos::Configuration *raw_config = config_reader.configuration();
+    const aos::Configuration *raw_config = config_reader.logged_configuration();
     config = aos::configuration::AddChannelToConfiguration(
         raw_config, "/clocks",
         aos::FlatbufferSpan<reflection::Schema>(aos::ClockTimepointsSchema()),
@@ -74,26 +74,33 @@
   std::unique_ptr<aos::EventLoop> clock_event_loop;
   std::unique_ptr<aos::ClockPublisher> clock_publisher;
   if (FLAGS_include_clocks) {
-    // TODO(james): Currently, because of RegisterWithoutStarting, this ends up
-    // running from t=0.0 rather than the start of the logfile. Fix that.
-    clock_event_loop =
-        reader.event_loop_factory()->MakeEventLoop("clock", node);
-    clock_publisher =
-        std::make_unique<aos::ClockPublisher>(&factory, clock_event_loop.get());
+    reader.OnStart(node, [&clock_event_loop, &reader, &clock_publisher,
+                          &factory, node]() {
+      clock_event_loop =
+          reader.event_loop_factory()->MakeEventLoop("clock", node);
+      clock_publisher = std::make_unique<aos::ClockPublisher>(
+          &factory, clock_event_loop.get());
+    });
   }
 
-  std::unique_ptr<aos::EventLoop> mcap_event_loop =
-      reader.event_loop_factory()->MakeEventLoop("mcap", node);
+  std::unique_ptr<aos::EventLoop> mcap_event_loop;
   CHECK(!FLAGS_output_path.empty());
-  aos::McapLogger relogger(
-      mcap_event_loop.get(), FLAGS_output_path,
-      FLAGS_mode == "flatbuffer" ? aos::McapLogger::Serialization::kFlatbuffer
-                                 : aos::McapLogger::Serialization::kJson,
-      FLAGS_canonical_channel_names
-          ? aos::McapLogger::CanonicalChannelNames::kCanonical
-          : aos::McapLogger::CanonicalChannelNames::kShortened,
-      FLAGS_compress ? aos::McapLogger::Compression::kLz4
-                     : aos::McapLogger::Compression::kNone);
+  std::unique_ptr<aos::McapLogger> relogger;
+  factory.GetNodeEventLoopFactory(node)
+      ->OnStartup([&relogger, &mcap_event_loop, &reader, node]() {
+        mcap_event_loop =
+            reader.event_loop_factory()->MakeEventLoop("mcap", node);
+        relogger = std::make_unique<aos::McapLogger>(
+            mcap_event_loop.get(), FLAGS_output_path,
+            FLAGS_mode == "flatbuffer"
+                ? aos::McapLogger::Serialization::kFlatbuffer
+                : aos::McapLogger::Serialization::kJson,
+            FLAGS_canonical_channel_names
+                ? aos::McapLogger::CanonicalChannelNames::kCanonical
+                : aos::McapLogger::CanonicalChannelNames::kShortened,
+            FLAGS_compress ? aos::McapLogger::Compression::kLz4
+                           : aos::McapLogger::Compression::kNone);
+      });
   reader.event_loop_factory()->Run();
   reader.Deregister();
 }