From 58bcd6473f3153a54672a6af98d56e02d558ceb6 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 9 Jun 2017 20:46:32 +0200 Subject: [PATCH] Streamline the metrics member function names a bit. --- audio_mixer.cpp | 14 +++++++------- httpd.cpp | 2 +- metrics.cpp | 8 ++++---- metrics.h | 4 ++-- mixer.cpp | 36 ++++++++++++++++++------------------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/audio_mixer.cpp b/audio_mixer.cpp index 6a694cb..7da5b0b 100644 --- a/audio_mixer.cpp +++ b/audio_mixer.cpp @@ -214,13 +214,13 @@ AudioMixer::AudioMixer(unsigned num_cards) } } - global_metrics.register_double_metric("audio_loudness_short_lufs", &metric_audio_loudness_short_lufs, Metrics::TYPE_GAUGE); - global_metrics.register_double_metric("audio_loudness_integrated_lufs", &metric_audio_loudness_integrated_lufs, Metrics::TYPE_GAUGE); - global_metrics.register_double_metric("audio_loudness_range_low_lufs", &metric_audio_loudness_range_low_lufs, Metrics::TYPE_GAUGE); - global_metrics.register_double_metric("audio_loudness_range_high_lufs", &metric_audio_loudness_range_high_lufs, Metrics::TYPE_GAUGE); - global_metrics.register_double_metric("audio_peak_dbfs", &metric_audio_peak_dbfs, Metrics::TYPE_GAUGE); - global_metrics.register_double_metric("audio_final_makeup_gain_db", &metric_audio_final_makeup_gain_db, Metrics::TYPE_GAUGE); - global_metrics.register_double_metric("audio_correlation", &metric_audio_correlation, Metrics::TYPE_GAUGE); + global_metrics.add("audio_loudness_short_lufs", &metric_audio_loudness_short_lufs, Metrics::TYPE_GAUGE); + global_metrics.add("audio_loudness_integrated_lufs", &metric_audio_loudness_integrated_lufs, Metrics::TYPE_GAUGE); + global_metrics.add("audio_loudness_range_low_lufs", &metric_audio_loudness_range_low_lufs, Metrics::TYPE_GAUGE); + global_metrics.add("audio_loudness_range_high_lufs", &metric_audio_loudness_range_high_lufs, Metrics::TYPE_GAUGE); + global_metrics.add("audio_peak_dbfs", &metric_audio_peak_dbfs, Metrics::TYPE_GAUGE); + global_metrics.add("audio_final_makeup_gain_db", &metric_audio_final_makeup_gain_db, Metrics::TYPE_GAUGE); + global_metrics.add("audio_correlation", &metric_audio_correlation, Metrics::TYPE_GAUGE); } void AudioMixer::reset_resampler(DeviceSpec device_spec) diff --git a/httpd.cpp b/httpd.cpp index 638c985..13d2a71 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -22,7 +22,7 @@ using namespace std; HTTPD::HTTPD() { - global_metrics.register_int_metric("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE); + global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE); } HTTPD::~HTTPD() diff --git a/metrics.cpp b/metrics.cpp index 7adcc98..b721214 100644 --- a/metrics.cpp +++ b/metrics.cpp @@ -7,13 +7,13 @@ using namespace std; Metrics global_metrics; -void Metrics::register_int_metric(const string &name, atomic *location, Metrics::Type type) +void Metrics::add(const string &name, atomic *location, Metrics::Type type) { lock_guard lock(mu); int_metrics.emplace(name, Metric{ type, location }); } -void Metrics::register_double_metric(const string &name, atomic *location, Metrics::Type type) +void Metrics::add(const string &name, atomic *location, Metrics::Type type) { lock_guard lock(mu); double_metrics.emplace(name, Metric{ type, location }); @@ -32,8 +32,8 @@ string Metrics::serialize() const ss << "nageru_" << key_and_value.first << " " << key_and_value.second.location->load() << "\n"; } - ss.precision(20); - ss << scientific; +// ss.precision(20); +// ss << scientific; for (const auto &key_and_value : double_metrics) { if (key_and_value.second.type == TYPE_GAUGE) { ss << "# TYPE nageru_" << key_and_value.first << " gauge\n"; diff --git a/metrics.h b/metrics.h index e54bbcf..3991d20 100644 --- a/metrics.h +++ b/metrics.h @@ -18,8 +18,8 @@ public: TYPE_GAUGE, }; - void register_int_metric(const std::string &name, std::atomic *location, Type type = TYPE_COUNTER); - void register_double_metric(const std::string &name, std::atomic *location, Type type = TYPE_COUNTER); + void add(const std::string &name, std::atomic *location, Type type = TYPE_COUNTER); + void add(const std::string &name, std::atomic *location, Type type = TYPE_COUNTER); std::string serialize() const; private: diff --git a/mixer.cpp b/mixer.cpp index 03caeb3..70b0de9 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -200,9 +200,9 @@ void upload_texture(GLuint tex, GLuint width, GLuint height, GLuint stride, bool void QueueLengthPolicy::register_metrics(const string &card_name) { - 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{" + card_name + "}", &metric_input_queue_length_frames, Metrics::TYPE_GAUGE); + global_metrics.add("input_queue_safe_length_frames{" + card_name + "}", &metric_input_queue_safe_length_frames, Metrics::TYPE_GAUGE); + global_metrics.add("input_queue_duped_frames{" + card_name + "}", &metric_input_duped_frames); } void QueueLengthPolicy::update_policy(unsigned queue_length) @@ -402,9 +402,9 @@ 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); + global_metrics.add("frames_output_total", &metric_frames_output_total); + global_metrics.add("frames_output_dropped", &metric_frames_output_dropped); + global_metrics.add("uptime_seconds", &metric_uptime_seconds); } Mixer::~Mixer() @@ -487,18 +487,18 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT 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); + global_metrics.add(string("input_dropped_frames_jitter{") + card_name + "}", &card->metric_input_dropped_frames_jitter); + global_metrics.add(string("input_dropped_frames_error{") + card_name + "}", &card->metric_input_dropped_frames_error); + global_metrics.add(string("input_dropped_frames_resets{") + card_name + "}", &card->metric_input_resets); + + global_metrics.add(string("input_has_signal_bool{") + card_name + "}", &card->metric_input_has_signal_bool, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_is_connected_bool{") + card_name + "}", &card->metric_input_is_connected_bool, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_interlaced_bool{") + card_name + "}", &card->metric_input_interlaced_bool, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_width_pixels{") + card_name + "}", &card->metric_input_width_pixels, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_height_pixels{") + card_name + "}", &card->metric_input_height_pixels, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_frame_rate_nom{") + card_name + "}", &card->metric_input_frame_rate_nom, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_frame_rate_den{") + card_name + "}", &card->metric_input_frame_rate_den, Metrics::TYPE_GAUGE); + global_metrics.add(string("input_sample_rate_hz{") + card_name + "}", &card->metric_input_sample_rate_hz, Metrics::TYPE_GAUGE); } void Mixer::set_output_card_internal(int card_index) -- 2.39.2