Update the queue length metric after trimming, not before.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 400fdd189e3935bb1148e3abc88796abc8c5bb4e..6846d83ffdbaef73420d638cc1b282ce11cb02a3 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -207,8 +207,6 @@ void QueueLengthPolicy::register_metrics(const vector<pair<string, string>> &lab
 
 void QueueLengthPolicy::update_policy(unsigned queue_length)
 {
-       metric_input_queue_length_frames = queue_length;
-
        if (queue_length == 0) {  // Starvation.
                if (been_at_safe_point_since_last_starvation && safe_queue_length < unsigned(global_flags.max_input_queue_frames)) {
                        ++safe_queue_length;
@@ -406,7 +404,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        global_metrics.add("frames_output_total", &metric_frames_output_total);
        global_metrics.add("frames_output_dropped", &metric_frames_output_dropped);
-       global_metrics.add("start_time_seconds", &metric_start_time_seconds);
+       global_metrics.add("start_time_seconds", &metric_start_time_seconds, Metrics::TYPE_GAUGE);
        global_metrics.add("memory_used_bytes", &metrics_memory_used_bytes);
        global_metrics.add("metrics_memory_locked_limit_bytes", &metrics_memory_locked_limit_bytes);
 }
@@ -1047,6 +1045,7 @@ void Mixer::trim_queue(CaptureCard *card, unsigned card_index)
                ++dropped_frames;
        }
 
+       metric_input_queue_length_frames = queue_length;
        card->metric_input_dropped_frames_jitter += dropped_frames;
 
 #if 0