Consistently use call_once to initialize static metrics.

[nageru] / quicksync_encoder.cpp

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 7cdec58a796d460be37dd068511a4dfdc58ddbf5..1b36aa5246fbda3b19b5e65a5abc48365ab23840 100644 (file)
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -68,9 +68,11 @@ namespace {
 
 // These need to survive several QuickSyncEncoderImpl instances,
 // so they are outside.
-bool mux_metrics_inited = false;
+once_flag quick_sync_metrics_inited;
 LatencyHistogram mixer_latency_histogram, qs_latency_histogram;
 MuxMetrics current_file_mux_metrics, total_mux_metrics;
+std::atomic<double> metric_current_file_start_time_seconds{0.0 / 0.0};
+std::atomic<int64_t> metric_quick_sync_stalled_frames{0};
 
 }  // namespace
 
@@ -1571,13 +1573,14 @@ QuickSyncEncoderImpl::QuickSyncEncoderImpl(const std::string &filename, Resource
                memset(&slice_param, 0, sizeof(slice_param));
        }
 
-       if (!mux_metrics_inited) {
+       call_once(quick_sync_metrics_inited, [](){
                mixer_latency_histogram.init("mixer");
                qs_latency_histogram.init("quick_sync");
                current_file_mux_metrics.init({{ "destination", "current_file" }});
                total_mux_metrics.init({{ "destination", "files_total" }});
-               mux_metrics_inited = true;
-       }
+               global_metrics.add("current_file_start_time_seconds", &metric_current_file_start_time_seconds, Metrics::TYPE_GAUGE);
+               global_metrics.add("quick_sync_stalled_frames", &metric_quick_sync_stalled_frames);
+       });
 
        storage_thread = thread(&QuickSyncEncoderImpl::storage_task_thread, this);
 
@@ -1638,6 +1641,7 @@ bool QuickSyncEncoderImpl::begin_frame(int64_t pts, int64_t duration, YCbCrLumaC
                if (surf == nullptr) {
                        fprintf(stderr, "Warning: No free slots for frame %d, rendering has to wait for H.264 encoder\n",
                                current_storage_frame);
+                       ++metric_quick_sync_stalled_frames;
                        storage_task_queue_changed.wait(lock, [this, &surf]{
                                if (storage_thread_should_quit)
                                        return true;
@@ -1808,6 +1812,7 @@ void QuickSyncEncoderImpl::shutdown()
 void QuickSyncEncoderImpl::close_file()
 {
        file_mux.reset();
+       metric_current_file_start_time_seconds = 0.0 / 0.0;
 }
 
 void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
@@ -1836,6 +1841,7 @@ void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
        file_mux.reset(new Mux(avctx, frame_width, frame_height, Mux::CODEC_H264, video_extradata, audio_codecpar.get(), TIMEBASE,
                std::bind(&DiskSpaceEstimator::report_write, disk_space_estimator, filename, _1),
                { &current_file_mux_metrics, &total_mux_metrics }));
+       metric_current_file_start_time_seconds = get_timestamp_for_metrics();
 
        if (global_flags.x264_video_to_disk) {
                x264_encoder->add_mux(file_mux.get());