Switch LogReader to the new API, and remove the old
Now that we have a fancy new log sorter, lets flip over to using it.
This doesn't simplify anything yet on the log reader side to take
advantage of the simpler code.
While we are here, the new API really wants a LogFiles object instead of
vectors of strings. Convert any calls over to the new LogFiles API.
The log file was updated to add UUIDs. They are required with
multi-node log files, and it doesn't seem worth changing that
requirement for this old log.
Change-Id: I84bd63c7339ec43ed01c106131153e1cb6d213bb
diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index dbc8a78..f2969ad 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -279,8 +279,7 @@
// Even though it doesn't make any difference here, exercise the logic for
// passing in a separate config.
- LogReader reader(std::vector<std::string>{logfile0, logfile1},
- &config_.message());
+ LogReader reader(SortParts({logfile0, logfile1}), &config_.message());
// Confirm that we can remap logged channels to point to new buses.
reader.RemapLoggedChannel<aos::examples::Ping>("/test", "/original");
@@ -762,7 +761,7 @@
"/pi2/aos", "aos.message_bridge.Timestamp", 190)));
}
- LogReader reader(structured_logfiles_);
+ LogReader reader(SortParts(logfiles_));
SimulatedEventLoopFactory log_reader_factory(reader.configuration());
log_reader_factory.set_send_delay(chrono::microseconds(0));
@@ -938,7 +937,8 @@
}
)");
- EXPECT_DEATH(LogReader(structured_logfiles_, &extra_nodes_config.message()),
+ const std::vector<LogFile> sorted_parts = SortParts(logfiles_);
+ EXPECT_DEATH(LogReader(sorted_parts, &extra_nodes_config.message()),
"Log file and replay config need to have matching nodes lists.");
}
@@ -960,7 +960,7 @@
event_loop_factory_.RunFor(chrono::milliseconds(20000));
}
- LogReader reader(structured_logfiles_);
+ LogReader reader(SortParts(logfiles_));
SimulatedEventLoopFactory log_reader_factory(reader.configuration());
log_reader_factory.set_send_delay(chrono::microseconds(0));
@@ -1100,7 +1100,7 @@
event_loop_factory_.RunFor(chrono::milliseconds(400));
}
- LogReader reader(structured_logfiles_);
+ LogReader reader(SortParts(logfiles_));
SimulatedEventLoopFactory log_reader_factory(reader.configuration());
log_reader_factory.set_send_delay(chrono::microseconds(0));
@@ -1318,7 +1318,7 @@
event_loop_factory_.RunFor(chrono::milliseconds(20000));
}
- LogReader reader(structured_logfiles_);
+ LogReader reader(SortParts(logfiles_));
// Remap just on pi1.
reader.RemapLoggedChannel<aos::timing::Report>(
@@ -1384,7 +1384,7 @@
event_loop_factory_.RunFor(chrono::milliseconds(20000));
}
- LogReader reader(structured_logfiles_);
+ LogReader reader(SortParts(logfiles_));
SimulatedEventLoopFactory log_reader_factory(reader.configuration());
log_reader_factory.set_send_delay(chrono::microseconds(0));