2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.


pcap-client,pcap-server: Use rate_ctr_inc2 and rate_ctr_add2 APIs

Change-Id: Idcc20646d252ad7bf61a740d900b31ca37ada280
---
M src/osmo_client_core.c
M src/osmo_client_network.c
M src/osmo_server_network.c
3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c
index d111fca..7338622 100644
--- a/src/osmo_client_core.c
+++ b/src/osmo_client_core.c
@@ -163,7 +163,7 @@
 
 	data = pcap_next(ph->handle, &hdr);
 	if (!data) {
-		rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR));
+		rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR);
 		return -1;
 	}
 
@@ -205,7 +205,7 @@
 	uint64_t inc;
 
 	inc = get_psbl_wrapped_ctr(*old_val, new_val);
-	rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), inc);
+	rate_ctr_add2(client->ctrg, ctr, inc);
 	*old_val = new_val;
 }
 
@@ -223,7 +223,7 @@
 	rc = pcap_stats(ph->handle, &stat);
 	if (rc != 0) {
 		LOGPH(ph, LOGL_ERROR, "Failed to query pcap stats: %s\n", pcap_geterr(ph->handle));
-		rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR));
+		rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR);
 		return;
 	}
 
diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c
index bc99087..70fe740 100644
--- a/src/osmo_client_network.c
+++ b/src/osmo_client_network.c
@@ -61,7 +61,7 @@
 	if (osmo_wqueue_enqueue_quiet(&conn->wqueue, msg) != 0) {
 		LOGCONN(conn, LOGL_ERROR, "Failed to enqueue msg (capacity: %u/%u)\n",
 			conn->wqueue.current_length, conn->wqueue.max_length);
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_QERR));
+		rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_QERR);
 		msgb_free(msg);
 		return;
 	}
@@ -91,7 +91,7 @@
 	if (rc < 0) {
 		struct osmo_pcap_client_conn *conn = fd->data;
 		LOGCONN(conn, LOGL_ERROR, "Lost connection on write\n");
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_WERR));
+		rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_WERR);
 		lost_connection(conn);
 		return -1;
 	}
@@ -172,13 +172,13 @@
 	if (in_hdr->len > in_hdr->caplen) {
 		LOGCONN(conn, LOGL_ERROR, "Recording truncated packet, len %zu > snaplen %zu\n",
 			(size_t) in_hdr->len, (size_t) in_hdr->caplen);
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_2BIG));
+		rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_2BIG);
 	}
 
 	msg = msgb_alloc(in_hdr->caplen + sizeof(*om_hdr) + sizeof(*hdr), "data-data");
 	if (!msg) {
 		LOGCONN(conn, LOGL_ERROR, "Failed to allocate\n");
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_NOMEM));
+		rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_NOMEM);
 		return;
 	}
 
@@ -198,8 +198,8 @@
 		memcpy(msg->l3h, data, in_hdr->caplen);
 
 		om_hdr->len = htons(msgb_l2len(msg));
-		rate_ctr_add(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_BYTES), hdr->caplen);
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_PKTS));
+		rate_ctr_add2(conn->client->ctrg, CLIENT_CTR_BYTES, hdr->caplen);
+		rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_PKTS);
 		break;
 	case PROTOCOL_IPIP:
 		/* TODO: support capturing from multiple interfaces here: */
@@ -310,7 +310,7 @@
 	osmo_fd_setup(&conn->wqueue.bfd, rc, when, conn_cb, conn, 0);
 	osmo_fd_register(&conn->wqueue.bfd);
 
-	rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_CONNECT));
+	rate_ctr_inc2(conn->client->ctrg, CLIENT_CTR_CONNECT);
 }
 
 void osmo_client_conn_reconnect(struct osmo_pcap_client_conn *conn)
diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c
index 1c8d442..0b0073f 100644
--- a/src/osmo_server_network.c
+++ b/src/osmo_server_network.c
@@ -121,8 +121,8 @@
 
 	if (conn->curr_filename) {
 		client_event(conn, "closingtracefile", conn->curr_filename);
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_PROTATE));
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_PROTATE));
+		rate_ctr_inc2(conn->ctrg, PEER_CTR_PROTATE);
+		rate_ctr_inc2(conn->server->ctrg, SERVER_CTR_PROTATE);
 		talloc_free(conn->curr_filename);
 		conn->curr_filename = NULL;
 	}
@@ -568,12 +568,12 @@
 		conn->pend = sizeof(*conn->data);
 
 		/* count the full packet we got */
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_PKTS));
-		rate_ctr_inc(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_PKTS));
+		rate_ctr_inc2(conn->ctrg, PEER_CTR_PKTS);
+		rate_ctr_inc2(conn->server->ctrg, SERVER_CTR_PKTS);
 
 		/* count the bytes of it */
-		rate_ctr_add(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_BYTES), conn->data->len);
-		rate_ctr_add(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_BYTES), conn->data->len);
+		rate_ctr_add2(conn->ctrg, PEER_CTR_BYTES, conn->data->len);
+		rate_ctr_add2(conn->server->ctrg, SERVER_CTR_BYTES, conn->data->len);
 
 		switch (conn->data->type) {
 		case PKT_LINK_HDR:
@@ -666,7 +666,7 @@
 		return;
 	}
 
-	rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, PEER_CTR_CONNECT));
+	rate_ctr_inc2(client->ctrg, PEER_CTR_CONNECT);
 
 	client->state = STATE_INITIAL;
 	client->pend = sizeof(*client->data);
@@ -711,7 +711,7 @@
 	server = fd->data;
 
 	/* count any accept to see no clients */
-	rate_ctr_inc(rate_ctr_group_get_ctr(server->ctrg, SERVER_CTR_CONNECT));
+	rate_ctr_inc2(server->ctrg, SERVER_CTR_CONNECT);
 
 	llist_for_each_entry(conn, &server->conn, entry) {
 		if (conn->remote_addr.s_addr == addr.sin_addr.s_addr) {
@@ -723,7 +723,7 @@
 		}
 	}
 
-	rate_ctr_inc(rate_ctr_group_get_ctr(server->ctrg, SERVER_CTR_NOCLIENT));
+	rate_ctr_inc2(server->ctrg, SERVER_CTR_NOCLIENT);
 
 	/*
 	 * TODO: In the future start with a tls handshake and see if we know

