X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=6846d83ffdbaef73420d638cc1b282ce11cb02a3;hb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;hp=03caeb3cc63208660c64c983f42f334084bbb3e9;hpb=9e054cd044975cd8ec42609564be39099ce19679;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 03caeb3..6846d83 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -198,17 +198,15 @@ void upload_texture(GLuint tex, GLuint width, GLuint height, GLuint stride, bool
 
 }  // namespace
 
-void QueueLengthPolicy::register_metrics(const string &card_name)
+void QueueLengthPolicy::register_metrics(const vector<pair<string, string>> &labels)
 {
-	global_metrics.register_int_metric("input_queue_length_frames{" + card_name + "}", &metric_input_queue_length_frames, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric("input_queue_safe_length_frames{" + card_name + "}", &metric_input_queue_safe_length_frames, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric("input_queue_duped_frames{" + card_name + "}", &metric_input_duped_frames);
+	global_metrics.add("input_queue_length_frames", labels, &metric_input_queue_length_frames, Metrics::TYPE_GAUGE);
+	global_metrics.add("input_queue_safe_length_frames", labels, &metric_input_queue_safe_length_frames, Metrics::TYPE_GAUGE);
+	global_metrics.add("input_queue_duped_frames", labels, &metric_input_duped_frames);
 }
 
 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;
@@ -402,9 +400,13 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 		set_output_card_internal(global_flags.output_card);
 	}
 
-	global_metrics.register_int_metric("frames_output_total", &metric_frames_output_total);
-	global_metrics.register_int_metric("frames_output_dropped", &metric_frames_output_dropped);
-	global_metrics.register_double_metric("uptime_seconds", &metric_uptime_seconds);
+	metric_start_time_seconds = get_timestamp_for_metrics();
+
+	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, 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);
 }
 
 Mixer::~Mixer()
@@ -472,33 +474,37 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 	audio_mixer.trigger_state_changed_callback();
 
 	// Register metrics.
+	vector<pair<string, string>> labels;
 	char card_name[64];
+	snprintf(card_name, sizeof(card_name), "%d", card_index);
+	labels.emplace_back("card", card_name);
+
 	switch (card_type) {
 	case CardType::LIVE_CARD:
-		snprintf(card_name, sizeof(card_name), "card=\"%d\",cardtype=\"live\"", card_index);
+		labels.emplace_back("cardtype", "live");
 		break;
 	case CardType::FAKE_CAPTURE:
-		snprintf(card_name, sizeof(card_name), "card=\"%d\",cardtype=\"fake\"", card_index);
+		labels.emplace_back("cardtype", "fake");
 		break;
 	case CardType::FFMPEG_INPUT:
-		snprintf(card_name, sizeof(card_name), "card=\"%d\",cardtype=\"ffmpeg\"", card_index);
+		labels.emplace_back("cardtype", "ffmpeg");
 		break;
 	default:
 		assert(false);
 	}
-	card->queue_length_policy.register_metrics(card_name);
-	global_metrics.register_int_metric(string("input_dropped_frames_jitter{") + card_name + "}", &card->metric_input_dropped_frames_jitter);
-	global_metrics.register_int_metric(string("input_dropped_frames_error{") + card_name + "}", &card->metric_input_dropped_frames_error);
-	global_metrics.register_int_metric(string("input_dropped_frames_resets{") + card_name + "}", &card->metric_input_resets);
-
-	global_metrics.register_int_metric(string("input_has_signal_bool{") + card_name + "}", &card->metric_input_has_signal_bool, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_is_connected_bool{") + card_name + "}", &card->metric_input_is_connected_bool, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_interlaced_bool{") + card_name + "}", &card->metric_input_interlaced_bool, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_width_pixels{") + card_name + "}", &card->metric_input_width_pixels, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_height_pixels{") + card_name + "}", &card->metric_input_height_pixels, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_frame_rate_nom{") + card_name + "}", &card->metric_input_frame_rate_nom, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_frame_rate_den{") + card_name + "}", &card->metric_input_frame_rate_den, Metrics::TYPE_GAUGE);
-	global_metrics.register_int_metric(string("input_sample_rate_hz{") + card_name + "}", &card->metric_input_sample_rate_hz, Metrics::TYPE_GAUGE);
+	card->queue_length_policy.register_metrics(labels);
+	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);
+
+	global_metrics.add("input_has_signal_bool", labels, &card->metric_input_has_signal_bool, Metrics::TYPE_GAUGE);
+	global_metrics.add("input_is_connected_bool", labels, &card->metric_input_is_connected_bool, Metrics::TYPE_GAUGE);
+	global_metrics.add("input_interlaced_bool", labels, &card->metric_input_interlaced_bool, Metrics::TYPE_GAUGE);
+	global_metrics.add("input_width_pixels", labels, &card->metric_input_width_pixels, Metrics::TYPE_GAUGE);
+	global_metrics.add("input_height_pixels", labels, &card->metric_input_height_pixels, Metrics::TYPE_GAUGE);
+	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);
 }
 
 void Mixer::set_output_card_internal(int card_index)
@@ -931,7 +937,6 @@ void Mixer::thread_func()
 
 		metric_frames_output_total = frame_num;
 		metric_frames_output_dropped = stats_dropped_frames;
-		metric_uptime_seconds = elapsed;
 
 		if (frame_num % 100 == 0) {
 			printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)",
@@ -963,12 +968,16 @@ void Mixer::thread_func()
 						long(limit.rlim_cur / 1048576),
 						float(100.0 * (used.ru_maxrss * 1024.0) / limit.rlim_cur));
 				}
+				metrics_memory_locked_limit_bytes = limit.rlim_cur;
 			} else {
 				printf(", using %ld MB memory (not locked)",
 					long(used.ru_maxrss / 1024));
+				metrics_memory_locked_limit_bytes = 0.0 / 0.0;
 			}
 
 			printf("\n");
+
+			metrics_memory_used_bytes = used.ru_maxrss;
 		}
 
 
@@ -1036,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