BWE Simulation Framework: Standard plot logging

webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 293 matching lines @@
   LinkShare link_share(&choke);
 
   int64_t one_way_delay_ms = rtt_ms / 2;
   DelayFilter delay_uplink(&uplink_, all_flow_ids);
   delay_uplink.SetOneWayDelayMs(one_way_delay_ms);
 
   JitterFilter jitter(&uplink_, all_flow_ids);
   jitter.SetMaxJitter(max_jitter_ms);
 
   std::vector<RateCounterFilter*> rate_counters;
-  for (int flow : all_flow_ids) {
+  for (int flow : media_flow_ids) {
     rate_counters.push_back(
-        new RateCounterFilter(&uplink_, flow, "receiver_input"));
+        new RateCounterFilter(&uplink_, flow, "Receiver", bwe_names[bwe_type]));
+  }
+  for (int flow : tcp_flow_ids) {
+    rate_counters.push_back(new RateCounterFilter(&uplink_, flow, "Receiver",
+                                                  bwe_names[kTcpEstimator]));
   }
 
-  RateCounterFilter total_utilization(&uplink_, all_flow_ids,
-                                      "total_utilization");
+  RateCounterFilter total_utilization(
+      &uplink_, all_flow_ids, "total_utilization", "Total_link_utilization");
 
   std::vector<PacketReceiver*> receivers;
   // Delays is being plotted only for the first flow.
   // To plot all of them, replace "i == 0" with "true" on new PacketReceiver().
   for (int media_flow : media_flow_ids) {
     metric_recorders.push_back(
         new MetricRecorder(bwe_names[bwe_type], static_cast<int>(media_flow),
                            senders[media_flow], &link_share));
     receivers.push_back(new PacketReceiver(&uplink_, media_flow, bwe_type,
                                            media_flow == 0, false,
@@ skipping 153 matching lines @@
     sources.push_back(new AdaptiveVideoSource(static_cast<int>(i), 30, 300, 0,
                                               i * kStartingApartMs));
     senders.push_back(new VideoSender(&uplink_, sources[i], bwe_type));
   }
 
   FlowIds flow_ids = CreateFlowIdRange(0, static_cast<int>(num_flows - 1));
 
   DefaultEvaluationFilter up_filter(&uplink_, flow_ids);
   LinkShare link_share(&(up_filter.choke));
 
-  RateCounterFilter total_utilization(&uplink_, flow_ids, "Total_utilization");
+  RateCounterFilter total_utilization(&uplink_, flow_ids, "Total_utilization",
+                                      "Total_link_utilization");
 
   // Delays is being plotted only for the first flow.
   // To plot all of them, replace "i == 0" with "true" on new PacketReceiver().
   for (size_t i = 0; i < num_flows; ++i) {
     metric_recorders.push_back(new MetricRecorder(
         bwe_names[bwe_type], static_cast<int>(i), senders[i], &link_share));
 
     receivers.push_back(new PacketReceiver(&uplink_, static_cast<int>(i),
                                            bwe_type, i == 0, false,
                                            metric_recorders[i]));
@@ skipping 170 matching lines @@
   LinkShare link_share(&choke_filter);
 
   JitterFilter jitter_filter(&uplink_, CreateFlowIds(kAllFlowIds, kNumFlows));
 
   rtc::scoped_ptr<DelayFilter> up_delay_filters[kNumFlows];
   for (size_t i = 0; i < kNumFlows; ++i) {
     up_delay_filters[i].reset(new DelayFilter(&uplink_, kAllFlowIds[i]));
   }
 
   RateCounterFilter total_utilization(
-      &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "Total_utilization");
+      &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "Total_utilization",
+      "Total_link_utilization");
 
   // Delays is being plotted only for the first flow.
   // To plot all of them, replace "i == 0" with "true" on new PacketReceiver().
   rtc::scoped_ptr<PacketReceiver> receivers[kNumFlows];
   for (size_t i = 0; i < kNumFlows; ++i) {
     metric_recorders[i].reset(
         new MetricRecorder(bwe_names[bwe_type], static_cast<int>(i),
                            senders[i].get(), &link_share));
 
     receivers[i].reset(new PacketReceiver(&uplink_, kAllFlowIds[i], bwe_type,
@@ skipping 94 matching lines @@
     senders[id].reset(new TcpSender(&uplink_, static_cast<int>(id),
                                     tcp_starting_times_ms[id - kNumRmcatFlows],
                                     tcp_file_sizes_bytes[id - kNumRmcatFlows]));
   }
 
   FlowIds flow_ids = CreateFlowIdRange(0, static_cast<int>(kNumTotalFlows - 1));
   DefaultEvaluationFilter up_filter(&uplink_, flow_ids);
 
   LinkShare link_share(&(up_filter.choke));
 
-  RateCounterFilter total_utilization(&uplink_, flow_ids, "Total_utilization");
+  RateCounterFilter total_utilization(&uplink_, flow_ids, "Total_utilization",
+                                      "Total_link_utilization");
 
   // Delays is being plotted only for the first flow.
   // To plot all of them, replace "i == 0" with "true" on new PacketReceiver().
   for (size_t id : kAllRmcatFlowIds) {
     metric_recorders[id].reset(
         new MetricRecorder(bwe_names[bwe_type], static_cast<int>(id),
                            senders[id].get(), &link_share));
     receivers[id].reset(new PacketReceiver(&uplink_, static_cast<int>(id),
                                            bwe_type, id == 0, false,
                                            metric_recorders[id].get()));
@@ skipping 66 matching lines @@
                                              i * kStartingApartMs));
     senders[i].reset(new VideoSender(&uplink_, sources[i].get(), bwe_type));
   }
 
   DefaultEvaluationFilter filter(&uplink_,
                                  CreateFlowIds(kAllFlowIds, kNumFlows));
 
   LinkShare link_share(&(filter.choke));
 
   RateCounterFilter total_utilization(
-      &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "Total_utilization");
+      &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "Total_utilization",
+      "Total_link_utilization");
 
   // Delays is being plotted only for the first flow.
   // To plot all of them, replace "i == 0" with "true" on new PacketReceiver().
   for (size_t i = 0; i < kNumFlows; ++i) {
     metric_recorders[i].reset(
         new MetricRecorder(bwe_names[bwe_type], static_cast<int>(i),
                            senders[i].get(), &link_share));
     receivers[i].reset(new PacketReceiver(&uplink_, kAllFlowIds[i], bwe_type,
                                           i == 0, false,
                                           metric_recorders[i].get()));
@@ skipping 72 matching lines @@
     tcp_starting_times_ms.push_back(
         static_cast<int64_t>(random.Exponential(1.0f / kMeanMs)));
   }
 
   return tcp_starting_times_ms;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc