Add some memory metrics.

diff --git a/mixer.cpp b/mixer.cpp
index c551354e794ab87ed1307b940933978e11553c4c..24f2a8091c941a8f9338964902be0c988a7a6ba9 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -405,6 +405,8 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
        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);
+       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()
@@ -967,12 +969,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;
                }
 
 

diff --git a/mixer.h b/mixer.h
index 57552879a95ddac9014a6fc2ce056d48335a0b80..e2490ede7d9245b43db081f73abc3b975e605e59 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -544,6 +544,8 @@ private:
        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<int64_t> metrics_memory_used_bytes{0};
+       std::atomic<double> metrics_memory_locked_limit_bytes{0.0 / 0.0};
 };
 
 extern Mixer *global_mixer;