From 597229f4c8a9aa19a37e30300c3ff474192b16a3 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 9 Jan 2025 08:22:48 -0400 Subject: [PATCH] MT#61822 add player_cache stats metric Change-Id: Ie65070f1a0ea87aebb2f11b2089fdf94969f9986 --- daemon/media_player.c | 2 ++ daemon/statistics.c | 2 ++ include/gauge_stats_fields.inc | 1 + t/test-stats.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/daemon/media_player.c b/daemon/media_player.c index 5af6b9776..3d4dc2d82 100644 --- a/daemon/media_player.c +++ b/daemon/media_player.c @@ -827,6 +827,8 @@ static void packet_encoded_cache(AVPacket *pkt, struct codec_ssrc_handler *ch, s cond_broadcast(&entry->cond); mutex_unlock(&entry->lock); + + RTPE_GAUGE_ADD(player_cache, s->len); } static int media_player_packet_cache(encoder_t *enc, void *u1, void *u2) { diff --git a/daemon/statistics.c b/daemon/statistics.c index 4ae8a26ac..adb013611 100644 --- a/daemon/statistics.c +++ b/daemon/statistics.c @@ -339,6 +339,8 @@ stats_metric_q *statistics_gather_metrics(struct interface_sampled_rate_stats *i PROM("transcoded_media", "gauge"); METRIC("mediacache", "Media cache size", UINT64F, UINT64F, atomic64_get_na(&rtpe_stats_gauge.media_cache)); PROM("media_cache", "gauge"); + METRIC("playercache", "Player cache size", UINT64F, UINT64F, atomic64_get_na(&rtpe_stats_gauge.player_cache)); + PROM("player_cache", "gauge"); METRIC("packetrate_user", "Packets per second (userspace)", UINT64F, UINT64F, atomic64_get_na(&rtpe_stats_rate.packets_user)); diff --git a/include/gauge_stats_fields.inc b/include/gauge_stats_fields.inc index 53b8c3f75..eb916e9a4 100644 --- a/include/gauge_stats_fields.inc +++ b/include/gauge_stats_fields.inc @@ -8,3 +8,4 @@ F(userspace_streams) F(kernel_only_streams) F(kernel_user_streams) F(media_cache) +F(player_cache) diff --git a/t/test-stats.c b/t/test-stats.c index f5161cadd..4668a7c72 100644 --- a/t/test-stats.c +++ b/t/test-stats.c @@ -344,6 +344,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n" @@ -1476,6 +1480,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n" @@ -2605,6 +2613,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n" @@ -3753,6 +3765,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n" @@ -4890,6 +4906,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n" @@ -6022,6 +6042,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n" @@ -7156,6 +7180,10 @@ int main(void) { "mediacache\n" "0\n" "0\n" + "Player cache size\n" + "playercache\n" + "0\n" + "0\n" "Packets per second (userspace)\n" "packetrate_user\n" "0\n"