Remove old card metrics when reinitializing cards.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 07726bd8f1243ccde50e301ef26c4e96dddd1035..9f549e968b7eb173f872d55fc316f7c1982ccc3e 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -475,6 +475,24 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
        audio_mixer.set_display_name(device, card->capture->get_description());
        audio_mixer.trigger_state_changed_callback();
 
+       // Unregister old metrics, if any.
+       if (!card->labels.empty()) {
+               const vector<pair<string, string>> &labels = card->labels;
+               global_metrics.remove("input_received_frames", labels);
+               global_metrics.remove("input_dropped_frames_jitter", labels);
+               global_metrics.remove("input_dropped_frames_error", labels);
+               global_metrics.remove("input_dropped_frames_resets", labels);
+
+               global_metrics.remove("input_has_signal_bool", labels);
+               global_metrics.remove("input_is_connected_bool", labels);
+               global_metrics.remove("input_interlaced_bool", labels);
+               global_metrics.remove("input_width_pixels", labels);
+               global_metrics.remove("input_height_pixels", labels);
+               global_metrics.remove("input_frame_rate_nom", labels);
+               global_metrics.remove("input_frame_rate_den", labels);
+               global_metrics.remove("input_sample_rate_hz", labels);
+       }
+
        // Register metrics.
        vector<pair<string, string>> labels;
        char card_name[64];
@@ -495,6 +513,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
                assert(false);
        }
        card->queue_length_policy.register_metrics(labels);
+       global_metrics.add("input_received_frames", labels, &card->metric_input_received_frames);
        global_metrics.add("input_dropped_frames_jitter", labels, &card->metric_input_dropped_frames_jitter);
        global_metrics.add("input_dropped_frames_error", labels, &card->metric_input_dropped_frames_error);
        global_metrics.add("input_dropped_frames_resets", labels, &card->metric_input_resets);
@@ -507,6 +526,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
        global_metrics.add("input_frame_rate_nom", labels, &card->metric_input_frame_rate_nom, Metrics::TYPE_GAUGE);
        global_metrics.add("input_frame_rate_den", labels, &card->metric_input_frame_rate_den, Metrics::TYPE_GAUGE);
        global_metrics.add("input_sample_rate_hz", labels, &card->metric_input_sample_rate_hz, Metrics::TYPE_GAUGE);
+       card->labels = labels;
 }
 
 void Mixer::set_output_card_internal(int card_index)
@@ -572,6 +592,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
        DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index};
        CaptureCard *card = &cards[card_index];
 
+       ++card->metric_input_received_frames;
        card->metric_input_has_signal_bool = video_format.has_signal;
        card->metric_input_is_connected_bool = video_format.is_connected;
        card->metric_input_interlaced_bool = video_format.interlaced;
@@ -1082,6 +1103,7 @@ start:
                // and then restart.
                assert(cards[master_card_index].capture->get_disconnected());
                handle_hotplugged_cards();
+               lock.unlock();
                goto start;
        }