commit 3b2b5b55add50e5a9adc13d4f870c4d739a79050
author Austin Schuh <austin.schuh@bluerivertech.com> Wed Jul 05 11:36:46 2023 -0700
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> Sun Jul 23 08:37:26 2023 -0700
tree 9e479b781bca581cb28b7529a0b5325863190584
parent dd847fd6515e95c9f1751bb6c70a2639a7177dc0

Expose PackConfiguration() method

Change-Id: I5a6f1e3555959b798bf35df397d07340cd05791e
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/events/logging/log_writer.cc

diff --git a/aos/events/logging/log_writer.cc b/aos/events/logging/log_writer.cc
index d129073..db6bcc1 100644
--- a/aos/events/logging/log_writer.cc
+++ b/aos/events/logging/log_writer.cc
@@ -231,18 +231,23 @@
   }
 }
 
+aos::SizePrefixedFlatbufferDetachedBuffer<LogFileHeader> PackConfiguration(
+    const Configuration *const configuration) {
+  flatbuffers::FlatBufferBuilder fbb;
+  flatbuffers::Offset<aos::Configuration> configuration_offset =
+      CopyFlatBuffer(configuration, &fbb);
+  LogFileHeader::Builder log_file_header_builder(fbb);
+  log_file_header_builder.add_configuration(configuration_offset);
+  fbb.FinishSizePrefixed(log_file_header_builder.Finish());
+  return fbb.Release();
+}
+
 std::string Logger::WriteConfiguration(LogNamer *log_namer) {
   std::string config_sha256;
 
   if (separate_config_) {
-    flatbuffers::FlatBufferBuilder fbb;
-    flatbuffers::Offset<aos::Configuration> configuration_offset =
-        CopyFlatBuffer(configuration_, &fbb);
-    LogFileHeader::Builder log_file_header_builder(fbb);
-    log_file_header_builder.add_configuration(configuration_offset);
-    fbb.FinishSizePrefixed(log_file_header_builder.Finish());
-    aos::SizePrefixedFlatbufferDetachedBuffer<LogFileHeader> config_header(
-        fbb.Release());
+    aos::SizePrefixedFlatbufferDetachedBuffer<LogFileHeader> config_header =
+        PackConfiguration(configuration_);
     config_sha256 = Sha256(config_header.span());
     LOG(INFO) << "Config sha256 of " << config_sha256;
     log_namer->WriteConfiguration(&config_header, config_sha256);

aos/events/logging/log_writer.h

diff --git a/aos/events/logging/log_writer.h b/aos/events/logging/log_writer.h
index 114e874..837a02a 100644
--- a/aos/events/logging/log_writer.h
+++ b/aos/events/logging/log_writer.h
@@ -20,6 +20,11 @@
 namespace aos {
 namespace logger {
 
+// Packs the provided configuration into the separate config LogFileHeader
+// container.
+aos::SizePrefixedFlatbufferDetachedBuffer<LogFileHeader> PackConfiguration(
+    const Configuration *const configuration);
+
 // Logs all channels available in the event loop to disk every 100 ms.
 // Start by logging one message per channel to capture any state and
 // configuration that is sent rately on a channel and would affect execution.