pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29457 )
Change subject: mgcp_conn: rename field s/rate_ctr_group/ctrg/g
......................................................................
mgcp_conn: rename field s/rate_ctr_group/ctrg/g
This makes all lines operating on rate groups way shorter. The "ctrg"
naming is already used in tons of places in osmocom code.
Change-Id: I745eddbf66e7d811bb73c8ae9bb54ea93073c71b
---
M include/osmocom/mgcp/mgcp_conn.h
M src/libosmo-mgcp/mgcp_conn.c
M src/libosmo-mgcp/mgcp_network.c
M src/libosmo-mgcp/mgcp_stat.c
M src/libosmo-mgcp/mgcp_vty.c
M tests/mgcp/mgcp_test.c
6 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/29457/1
diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h
index 5e262c3..ce864b8 100644
--- a/include/osmocom/mgcp/mgcp_conn.h
+++ b/include/osmocom/mgcp/mgcp_conn.h
@@ -103,7 +103,7 @@
struct osmo_iuup_rnl_prim *init_ind;
} iuup;
- struct rate_ctr_group *rate_ctr_group;
+ struct rate_ctr_group *ctrg;
};
/*! MGCP connection (untyped) */
diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c
index 6dc0199..7ab6eca 100644
--- a/src/libosmo-mgcp/mgcp_conn.c
+++ b/src/libosmo-mgcp/mgcp_conn.c
@@ -113,12 +113,12 @@
end->output_enabled = false;
end->maximum_packet_time = -1;
- conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn,
&rate_ctr_group_desc, rate_ctr_index++);
- if (!conn_rtp->rate_ctr_group)
+ conn_rtp->ctrg = rate_ctr_group_alloc(conn, &rate_ctr_group_desc,
rate_ctr_index++);
+ if (!conn_rtp->ctrg)
return -1;
- conn_rtp->state.in_stream.err_ts_ctr =
rate_ctr_group_get_ctr(conn_rtp->rate_ctr_group, IN_STREAM_ERR_TSTMP_CTR);
- conn_rtp->state.out_stream.err_ts_ctr =
rate_ctr_group_get_ctr(conn_rtp->rate_ctr_group, OUT_STREAM_ERR_TSTMP_CTR);
+ conn_rtp->state.in_stream.err_ts_ctr =
rate_ctr_group_get_ctr(conn_rtp->ctrg, IN_STREAM_ERR_TSTMP_CTR);
+ conn_rtp->state.out_stream.err_ts_ctr =
rate_ctr_group_get_ctr(conn_rtp->ctrg, OUT_STREAM_ERR_TSTMP_CTR);
/* Make sure codec table is reset */
mgcp_codec_reset_all(conn_rtp);
@@ -134,7 +134,7 @@
if (mgcp_conn_rtp_is_iuup(conn_rtp))
mgcp_conn_iuup_cleanup(conn_rtp);
mgcp_free_rtp_port(&conn_rtp->end);
- rate_ctr_group_free(conn_rtp->rate_ctr_group);
+ rate_ctr_group_free(conn_rtp->ctrg);
mgcp_codec_reset_all(conn_rtp);
}
@@ -263,7 +263,7 @@
static void aggregate_rtp_conn_stats(struct mgcp_endpoint *endp, struct
mgcp_conn_rtp *conn_rtp)
{
struct rate_ctr_group *all_stats =
endp->trunk->ratectr.all_rtp_conn_stats;
- struct rate_ctr_group *conn_stats = conn_rtp->rate_ctr_group;
+ struct rate_ctr_group *conn_stats = conn_rtp->ctrg;
if (all_stats == NULL || conn_stats == NULL)
return;
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 70193e9..dfbe4d3 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -62,7 +62,7 @@
void rtpconn_rate_ctr_add(struct mgcp_conn_rtp *conn_rtp, struct mgcp_endpoint
*endp,
int id, int inc)
{
- struct rate_ctr_group *conn_stats = conn_rtp->rate_ctr_group;
+ struct rate_ctr_group *conn_stats = conn_rtp->ctrg;
struct rate_ctr_group *mgw_stats =
endp->trunk->ratectr.all_rtp_conn_stats;
/* add to both the per-connection and the global stats */
@@ -1515,8 +1515,8 @@
sizeof(struct sockaddr_in)));
/* Increment RX statistics */
- rate_ctr_inc(rate_ctr_group_get_ctr(conn_src->rate_ctr_group,
RTP_PACKETS_RX_CTR));
- rate_ctr_add(rate_ctr_group_get_ctr(conn_src->rate_ctr_group,
RTP_OCTETS_RX_CTR), msgb_length(msg));
+ rate_ctr_inc(rate_ctr_group_get_ctr(conn_src->ctrg,
RTP_PACKETS_RX_CTR));
+ rate_ctr_add(rate_ctr_group_get_ctr(conn_src->ctrg, RTP_OCTETS_RX_CTR),
msgb_length(msg));
/* FIXME: count RTP and RTCP separately, also count IuUP payload-less
separately */
/* Forward a copy of the RTP data to a debug ip/port */
diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c
index e679882..d134526 100644
--- a/src/libosmo-mgcp/mgcp_stat.c
+++ b/src/libosmo-mgcp/mgcp_stat.c
@@ -39,7 +39,7 @@
void calc_loss(struct mgcp_conn_rtp *conn, uint32_t *expected, int *loss)
{
struct mgcp_rtp_state *state = &conn->state;
- struct rate_ctr *packets_rx =
rate_ctr_group_get_ctr(conn->rate_ctr_group, RTP_PACKETS_RX_CTR);
+ struct rate_ctr *packets_rx = rate_ctr_group_get_ctr(conn->ctrg,
RTP_PACKETS_RX_CTR);
*expected = state->stats.cycles + state->stats.max_seq;
*expected = *expected - state->stats.base_seq + 1;
@@ -80,10 +80,10 @@
int ploss;
int nchars;
- struct rate_ctr *packets_rx =
rate_ctr_group_get_ctr(conn->rate_ctr_group, RTP_PACKETS_RX_CTR);
- struct rate_ctr *octets_rx =
rate_ctr_group_get_ctr(conn->rate_ctr_group, RTP_OCTETS_RX_CTR);
- struct rate_ctr *packets_tx =
rate_ctr_group_get_ctr(conn->rate_ctr_group, RTP_PACKETS_TX_CTR);
- struct rate_ctr *octets_tx =
rate_ctr_group_get_ctr(conn->rate_ctr_group, RTP_OCTETS_TX_CTR);
+ struct rate_ctr *packets_rx = rate_ctr_group_get_ctr(conn->ctrg,
RTP_PACKETS_RX_CTR);
+ struct rate_ctr *octets_rx = rate_ctr_group_get_ctr(conn->ctrg,
RTP_OCTETS_RX_CTR);
+ struct rate_ctr *packets_tx = rate_ctr_group_get_ctr(conn->ctrg,
RTP_PACKETS_TX_CTR);
+ struct rate_ctr *octets_tx = rate_ctr_group_get_ctr(conn->ctrg,
RTP_OCTETS_TX_CTR);
calc_loss(conn, &expected, &ploss);
jitter = calc_jitter(&conn->state);
diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c
index f6c3c75..6183867 100644
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -169,11 +169,11 @@
struct rate_ctr *rx_packets, *rx_bytes;
struct rate_ctr *dropped_packets;
- tx_packets = rate_ctr_group_get_ctr(conn->rate_ctr_group,
RTP_PACKETS_TX_CTR);
- tx_bytes = rate_ctr_group_get_ctr(conn->rate_ctr_group,
RTP_OCTETS_TX_CTR);
- rx_packets = rate_ctr_group_get_ctr(conn->rate_ctr_group,
RTP_PACKETS_RX_CTR);
- rx_bytes = rate_ctr_group_get_ctr(conn->rate_ctr_group,
RTP_OCTETS_RX_CTR);
- dropped_packets = rate_ctr_group_get_ctr(conn->rate_ctr_group,
RTP_DROPPED_PACKETS_CTR);
+ tx_packets = rate_ctr_group_get_ctr(conn->ctrg, RTP_PACKETS_TX_CTR);
+ tx_bytes = rate_ctr_group_get_ctr(conn->ctrg, RTP_OCTETS_TX_CTR);
+ rx_packets = rate_ctr_group_get_ctr(conn->ctrg, RTP_PACKETS_RX_CTR);
+ rx_bytes = rate_ctr_group_get_ctr(conn->ctrg, RTP_OCTETS_RX_CTR);
+ dropped_packets = rate_ctr_group_get_ctr(conn->ctrg,
RTP_DROPPED_PACKETS_CTR);
vty_out(vty,
" Packets Sent: %" PRIu64 " (%" PRIu64 " bytes total)%s"
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 4ed18c2..e28a574 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1071,7 +1071,7 @@
"test-connection");
conn = mgcp_conn_get_rtp(&endp, _conn->id);
state = &conn->state;
- packets_rx = rate_ctr_group_get_ctr(conn->rate_ctr_group,
RTP_PACKETS_RX_CTR);
+ packets_rx = rate_ctr_group_get_ctr(conn->ctrg,
RTP_PACKETS_RX_CTR);
state->stats.initialized = 1;
state->stats.base_seq = pl_test_dat[i].base_seq;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29457
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I745eddbf66e7d811bb73c8ae9bb54ea93073c71b
Gerrit-Change-Number: 29457
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
