Update the queue length metric after trimming, not before.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index dd44f74bd74906b88c622dd8ff5e819d703daf87..8504d5eb4bb9d6a56d8b68dd2ab04464b0bcecfd 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -88,7 +88,7 @@ public:
                been_at_safe_point_since_last_starvation = false;
        }
 
-       void register_metrics(const std::string &card_name);
+       void register_metrics(const std::vector<std::pair<std::string, std::string>> &labels);
 
        void update_policy(unsigned queue_length);  // Call before picking out a frame, so 0 means starvation.
        unsigned get_safe_queue_length() const { return safe_queue_length; }
@@ -543,7 +543,9 @@ private:
        // Metrics.
        std::atomic<int64_t> metric_frames_output_total{0};
        std::atomic<int64_t> metric_frames_output_dropped{0};
-       std::atomic<double> metric_uptime_seconds{0.0};
+       std::atomic<double> metric_start_time_seconds{0.0 / 0.0};
+       std::atomic<int64_t> metrics_memory_used_bytes{0};
+       std::atomic<double> metrics_memory_locked_limit_bytes{0.0 / 0.0};
 };
 
 extern Mixer *global_mixer;