commit b4a59475d25ce68ed1561e54e66e30abe944c669
author Pau Espin Pedrol <pespin@sysmocom.de> Fri Sep 23 18:08:53 2022 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Sun Sep 25 00:05:49 2022 +0200
tree 086158c91f376ee812a13d505693c20ad9ac2c12
parent 2177919edb3bc0dd308be388272486ffd97f4761

osmux: Fix incorrect rate_ctr_group used in mgcp_osmux.c

During development of the counters, they were first added to the same
RTP counter group and later on split, but some places still used the
RTP related functions to increment the counters.
Let's add a seaprate set of helpers to update the correct osmux counter
group.

Fixes: 582c2bf7b0b3f6aabfb048a2d71c5fd9c60a105e

Change-Id: Ia2e5601c7d476b79afd95032dbc019517f8209af

src/libosmo-mgcp/mgcp_osmux.c

diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 72152c7..790c425 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -49,6 +49,21 @@
 	.ctr_desc = mgcp_conn_osmux_rate_ctr_desc
 };
 
+static void rtpconn_osmux_rate_ctr_add(struct mgcp_conn_rtp *conn_rtp, int id, int inc)
+{
+	struct rate_ctr_group *conn_osmux_stats = conn_rtp->osmux.ctrg;
+	struct rate_ctr_group *trunk_osmux_stats = conn_rtp->conn->endp->trunk->ratectr.all_osmux_conn_stats;
+
+	/* add to both the per-connection and the global stats */
+	rate_ctr_add(rate_ctr_group_get_ctr(conn_osmux_stats, id), inc);
+	rate_ctr_add(rate_ctr_group_get_ctr(trunk_osmux_stats, id), inc);
+}
+
+static void rtpconn_osmux_rate_ctr_inc(struct mgcp_conn_rtp *conn_rtp, int id)
+{
+	rtpconn_osmux_rate_ctr_add(conn_rtp, id, 1);
+}
+
 /* Deliver OSMUX batch to the remote end */
 static void osmux_deliver_cb(struct msgb *batch_msg, void *data)
 {
@@ -204,14 +219,14 @@
 	struct msgb *msg;
 
 	if (!conn->end.output_enabled) {
-		rtpconn_rate_ctr_inc(conn, conn->conn->endp, OSMUX_DROPPED_AMR_PAYLOADS_CTR);
+		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR);
 		return -1;
 	}
 
 	if (conn->osmux.state != OSMUX_STATE_ENABLED) {
 		LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to Osmux conn not yet enabled, dropping (cid=%d)\n",
 		conn->osmux.remote_cid);
-		rtpconn_rate_ctr_inc(conn, conn->conn->endp, OSMUX_DROPPED_AMR_PAYLOADS_CTR);
+		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR);
 		return -1;
 	}
 
@@ -428,9 +443,9 @@
 			goto out;
 		}*/
 		if (endp_osmux_state_check(endp, conn_src, false) == 0) {
-			rtpconn_rate_ctr_inc(conn_src, endp, OSMUX_CHUNKS_RX_CTR);
-			rtpconn_rate_ctr_add(conn_src, endp, OSMUX_OCTETS_RX_CTR,
-					     osmux_chunk_length(msg, rem));
+			rtpconn_osmux_rate_ctr_inc(conn_src, OSMUX_CHUNKS_RX_CTR);
+			rtpconn_osmux_rate_ctr_add(conn_src, OSMUX_OCTETS_RX_CTR,
+						   osmux_chunk_length(msg, rem));
 			osmux_xfrm_output_sched(conn_src->osmux.out, osmuxh);
 		}
 		rem = msg->len;

src/libosmo-mgcp/mgcp_ratectr.c

diff --git a/src/libosmo-mgcp/mgcp_ratectr.c b/src/libosmo-mgcp/mgcp_ratectr.c
index bf3d9d3..abf3883 100644
--- a/src/libosmo-mgcp/mgcp_ratectr.c
+++ b/src/libosmo-mgcp/mgcp_ratectr.c
@@ -151,7 +151,7 @@
 	.group_description = "aggregated statistics for all osmux connections",
 	.class_id = 1,
 	.num_ctr = ARRAY_SIZE(all_osmux_conn_rate_ctr_desc),
-	.ctr_desc = all_rtp_conn_rate_ctr_desc
+	.ctr_desc = all_osmux_conn_rate_ctr_desc
 };
 
 /*! allocate global rate counters