Add a summary for aggregated b-frame or not, since they are in general unaggregatable.

diff --git a/print_latency.cpp b/print_latency.cpp
index 4b7fa0bea8efbe84666f48d0a211c5457653ff24..52943537997cae27bf318ba2da15c1c843819371 100644 (file)
--- a/print_latency.cpp
+++ b/print_latency.cpp
@@ -45,9 +45,10 @@ void LatencyHistogram::init(const string &measuring_point)
                        snprintf(frame_index_str, sizeof(frame_index_str), "%u", frame_index);
 
                        vector<double> quantiles{0.01, 0.1, 0.25, 0.5, 0.75, 0.9, 0.99};
-                       summaries[card_index][frame_index].reset(new Summary[2]);
+                       summaries[card_index][frame_index].reset(new Summary[3]);
                        summaries[card_index][frame_index][0].init(quantiles, 60.0);
                        summaries[card_index][frame_index][1].init(quantiles, 60.0);
+                       summaries[card_index][frame_index][2].init(quantiles, 60.0);
                        global_metrics.add("latency_seconds",
                                {{ "measuring_point", measuring_point },
                                 { "card", card_index_str },
@@ -62,6 +63,13 @@ void LatencyHistogram::init(const string &measuring_point)
                                 { "frame_type", "b" }},
                                 &summaries[card_index][frame_index][1],
                                Metrics::PRINT_WHEN_NONEMPTY);
+                       global_metrics.add("latency_seconds",
+                               {{ "measuring_point", measuring_point },
+                                { "card", card_index_str },
+                                { "frame_age", frame_index_str },
+                                { "frame_type", "total" }},
+                                &summaries[card_index][frame_index][2],
+                               (frame_index == 0) ? Metrics::PRINT_ALWAYS : Metrics::PRINT_WHEN_NONEMPTY);
                }
        }
 }
@@ -83,6 +91,7 @@ void print_latency(const string &header, const ReceivedTimestamps &received_ts,
                        }
                        duration<double> latency = now - ts;
                        histogram->summaries[card_index][frame_index][is_b_frame].count_event(latency.count());
+                       histogram->summaries[card_index][frame_index][2].count_event(latency.count());
                }
        }
 

diff --git a/print_latency.h b/print_latency.h
index e2e5730e169d9e27bb4be98bf89e4d09dbcc904e..3e1c4060f530a204cb419a6166f2ec675987747e 100644 (file)
--- a/print_latency.h
+++ b/print_latency.h
@@ -21,7 +21,7 @@ struct ReceivedTimestamps {
 struct LatencyHistogram {
        void init(const std::string &measuring_point);  // Initializes histograms and registers them in global_metrics.
 
-       // Indices: card number, frame history number, b-frame or not (1/0).
+       // Indices: card number, frame history number, b-frame or not (1/0, where 2 counts both).
        std::vector<std::vector<std::unique_ptr<Summary[]>>> summaries;
 };