commit c1609732c0d658012ee6ac3fece89027f22a0dd4
author Austin Schuh <austin.schuh@bluerivertech.com> Mon Jun 26 11:51:28 2023 -0700
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> Sun Jul 23 08:37:25 2023 -0700
tree 322e0576ad240d2113e27a7a2a8dc76ab6d56933
parent dda6db79021996b26ca22516b03cac51551afca1

Drop intermediate list of files from log reading

We are saving a temporary variable in a ton of places for the lifetime
of the program.  Inline it so we can change the return type.

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

y2022/localizer/localizer_replay.cc

diff --git a/y2022/localizer/localizer_replay.cc b/y2022/localizer/localizer_replay.cc
index e706421..a3baf3b 100644
--- a/y2022/localizer/localizer_replay.cc
+++ b/y2022/localizer/localizer_replay.cc
@@ -29,13 +29,9 @@
   const aos::FlatbufferDetachedBuffer<aos::Configuration> config =
       aos::configuration::ReadConfig(FLAGS_config);
 
-  // find logfiles
-  std::vector<std::string> unsorted_logfiles =
-      aos::logger::FindLogs(argc, argv);
-
   // sort logfiles
   const std::vector<aos::logger::LogFile> logfiles =
-      aos::logger::SortParts(unsorted_logfiles);
+      aos::logger::SortParts(aos::logger::FindLogs(argc, argv));
 
   // open logfiles
   aos::logger::LogReader reader(logfiles, &config.message());

y2022/vision/viewer_replay.cc

diff --git a/y2022/vision/viewer_replay.cc b/y2022/vision/viewer_replay.cc
index 66087e5..7e8c800 100644
--- a/y2022/vision/viewer_replay.cc
+++ b/y2022/vision/viewer_replay.cc
@@ -47,10 +47,9 @@
   data->match_start = monotonic_clock::min_time;
   data->match_end = monotonic_clock::min_time;
 
-  std::vector<std::string> unsorted_logfiles =
-      aos::logger::FindLogs(FLAGS_roborio_log);
   // Open logfiles
-  aos::logger::LogReader reader(aos::logger::SortParts(unsorted_logfiles));
+  aos::logger::LogReader reader(
+      aos::logger::SortParts(aos::logger::FindLogs(FLAGS_roborio_log)));
   reader.Register();
   const aos::Node *roborio =
       aos::configuration::GetNode(reader.configuration(), "roborio");
@@ -149,11 +148,9 @@
         << "Can't use match timestamps if match never ended";
   }
 
-  std::vector<std::string> unsorted_logfiles =
-      aos::logger::FindLogs(FLAGS_logger_pi_log);
-
   // Open logfiles
-  aos::logger::LogReader reader(aos::logger::SortParts(unsorted_logfiles));
+  aos::logger::LogReader reader(
+      aos::logger::SortParts(aos::logger::FindLogs(FLAGS_logger_pi_log)));
   reader.Register();
   const aos::Node *pi =
       aos::configuration::GetNode(reader.configuration(), FLAGS_pi);