From cecee51bc40852824a28941d5e037d1bbe0d09a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Fri, 18 Oct 2024 10:53:23 +0200 Subject: [PATCH] Preserve the requested order for RTC event log plots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also remove some unused using-declarations. Bug: None Change-Id: Ia31fc7b888f68eb322f54f08638e34d31db1dcf8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366080 Reviewed-by: Jeremy Leconte Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/main@{#43262} --- rtc_tools/rtc_event_log_visualizer/analyzer.cc | 11 +++++++---- .../rtc_event_log_visualizer/analyzer_bindings.cc | 2 -- rtc_tools/rtc_event_log_visualizer/main.cc | 2 -- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc index d481f3ab02..d9df39c5d4 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc @@ -697,10 +697,13 @@ void EventLogAnalyzer::InitializeMapOfNamedGraphs(bool show_detector_state, void EventLogAnalyzer::CreateGraphsByName(const std::vector& names, PlotCollection* collection) { - for (const auto& plot : plots_) { - if (absl::c_find(names, plot.label) != names.end()) { - Plot* output = collection->AppendNewPlot(plot.label); - plot.plot_func(output); + for (absl::string_view name : names) { + auto plot = absl::c_find_if(plots_, [name](const PlotDeclaration& plot) { + return plot.label == name; + }); + if (plot != plots_.end()) { + Plot* output = collection->AppendNewPlot(plot->label); + plot->plot_func(output); } } } diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc b/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc index 0766615908..35a6375001 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc @@ -32,8 +32,6 @@ #include "rtc_tools/rtc_event_log_visualizer/proto/chart.pb.h" #endif -using webrtc::PacketDirection; - namespace { std::vector StrSplit(const std::string& s, const std::string& delimiter) { diff --git a/rtc_tools/rtc_event_log_visualizer/main.cc b/rtc_tools/rtc_event_log_visualizer/main.cc index 5ddaff8c02..78c09d3445 100644 --- a/rtc_tools/rtc_event_log_visualizer/main.cc +++ b/rtc_tools/rtc_event_log_visualizer/main.cc @@ -117,8 +117,6 @@ ABSL_FLAG(bool, false, "List of registered plots (for use with the --plot flag)"); -using webrtc::Plot; - namespace { std::vector StrSplit(const std::string& s, const std::string& delimiter) {