From 7f84fe590b29c6658db20b64c4b3edbbb91fdedb Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 14 Apr 2025 16:24:29 -0400 Subject: [PATCH] MT#55283 convert last_packet to int64_t Change-Id: Ia7fb2964d35f75a7bc21d058426d244838c77191 --- daemon/call_interfaces.c | 6 +++--- include/statistics.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index 4ec6bdce6..8d63f377e 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -420,7 +420,7 @@ str call_query_udp(char **out) { rwlock_unlock_w(&c->master_lock); ret = str_sprintf("%s %lld %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 "\n", out[RE_UDP_COOKIE], - (long long int) atomic_get_na(&rtpe_config.silent_timeout) - (timeval_from_us(rtpe_now).tv_sec - stats.last_packet), + (long long int) atomic_get_na(&rtpe_config.silent_timeout) - (timeval_from_us(rtpe_now).tv_sec - timeval_from_us(stats.last_packet_us).tv_sec), atomic64_get_na(&stats.totals[0].packets), atomic64_get_na(&stats.totals[1].packets), atomic64_get_na(&stats.totals[2].packets), atomic64_get_na(&stats.totals[3].packets)); goto out; @@ -2818,8 +2818,8 @@ static void ng_stats_stream(ng_command_ctx_t *ctx, parser_arg list, const struct ng_stats_stream_ssrc(parser, dict, ps->ssrc_out, "egress SSRCs"); stats: - if (totals->last_packet < packet_stream_last_packet(ps)) - totals->last_packet = packet_stream_last_packet(ps); + if (totals->last_packet_us < packet_stream_last_packet(ps) * 1000000LL) + totals->last_packet_us = packet_stream_last_packet(ps) * 1000000LL; /* XXX distinguish between input and output */ s = &totals->totals[0]; diff --git a/include/statistics.h b/include/statistics.h index 310ab8042..9c615abba 100644 --- a/include/statistics.h +++ b/include/statistics.h @@ -97,7 +97,7 @@ TYPED_GQUEUE(stats_metric, stats_metric) struct call_stats { - time_t last_packet; + int64_t last_packet_us; struct stream_stats totals[4]; /* rtp in, rtcp in, rtp out, rtcp out */ };