<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/24556">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use new stat item/ctr getter APIs<br><br>Generated with spatch:<br>"""<br>@@<br>expression E1, E2;<br>@@<br>- &E2->ctr[E1]<br>+ rate_ctr_group_get_ctr(E2, E1)<br>"""<br><br>Change-Id: Ic860db04489e9ee7312edb008497186116f30bfc<br>---<br>M src/osmo_client_core.c<br>M src/osmo_client_network.c<br>M src/osmo_server_network.c<br>3 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/56/24556/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c</span><br><span>index 025e3a4..59a6777 100644</span><br><span>--- a/src/osmo_client_core.c</span><br><span>+++ b/src/osmo_client_core.c</span><br><span>@@ -161,7 +161,7 @@</span><br><span> </span><br><span> data = pcap_next(client->handle, &hdr);</span><br><span> if (!data) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&client->ctrg->ctr[CLIENT_CTR_PERR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR));</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -190,14 +190,14 @@</span><br><span> * Only issue is we don't know sizeof(u_int)</span><br><span> */</span><br><span> if (*old_val > new_val) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_add(&client->ctrg->ctr[ctr], P_CAP_UINT_MAX() - *old_val);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_add(&client->ctrg->ctr[ctr], new_val);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), P_CAP_UINT_MAX() - *old_val);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), new_val);</span><br><span> *old_val = new_val;</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> /* Just increment it */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_add(&client->ctrg->ctr[ctr], new_val - *old_val);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(rate_ctr_group_get_ctr(client->ctrg, ctr), new_val - *old_val);</span><br><span> *old_val = new_val;</span><br><span> }</span><br><span> </span><br><span>@@ -215,7 +215,7 @@</span><br><span> if (rc != 0) {</span><br><span> LOGP(DCLIENT, LOGL_ERROR, "Failed to query pcap stats: %s\n",</span><br><span> pcap_geterr(client->handle));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&client->ctrg->ctr[CLIENT_CTR_PERR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, CLIENT_CTR_PERR));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c</span><br><span>index e5616af..a36a285 100644</span><br><span>--- a/src/osmo_client_network.c</span><br><span>+++ b/src/osmo_client_network.c</span><br><span>@@ -60,7 +60,7 @@</span><br><span> {</span><br><span> if (osmo_wqueue_enqueue_quiet(&conn->wqueue, msg) != 0) {</span><br><span> LOGP(DCLIENT, LOGL_ERROR, "Failed to enqueue conn=%s\n", conn->name);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_QERR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_QERR));</span><br><span> msgb_free(msg);</span><br><span> return;</span><br><span> }</span><br><span>@@ -92,7 +92,7 @@</span><br><span> struct osmo_pcap_client_conn *conn = fd->data;</span><br><span> LOGP(DCLIENT, LOGL_ERROR, "Lost connection on write to %s %s:%d.\n",</span><br><span> conn->name, conn->srv_ip, conn->srv_port);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_WERR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_WERR));</span><br><span> lost_connection(conn);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -173,13 +173,13 @@</span><br><span> LOGP(DCLIENT, LOGL_ERROR,</span><br><span> "Recording truncated packet, len %zu > snaplen %zu\n",</span><br><span> (size_t) in_hdr->len, (size_t) in_hdr->caplen);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_2BIG]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_2BIG));</span><br><span> }</span><br><span> </span><br><span> msg = msgb_alloc(in_hdr->caplen + sizeof(*om_hdr) + sizeof(*hdr), "data-data");</span><br><span> if (!msg) {</span><br><span> LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_NOMEM]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_NOMEM));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -199,8 +199,8 @@</span><br><span> memcpy(msg->l3h, data, in_hdr->caplen);</span><br><span> </span><br><span> om_hdr->len = htons(msgb_l2len(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_add(&conn->client->ctrg->ctr[CLIENT_CTR_BYTES], hdr->caplen);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_PKTS]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_BYTES), hdr->caplen);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_PKTS));</span><br><span> break;</span><br><span> case PROTOCOL_IPIP:</span><br><span> offset = get_iphdr_offset(pcap_datalink(conn->client->handle));</span><br><span>@@ -305,7 +305,7 @@</span><br><span> osmo_fd_setup(&conn->wqueue.bfd, rc, when, conn_cb, conn, 0);</span><br><span> osmo_fd_register(&conn->wqueue.bfd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_CONNECT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_CONNECT));</span><br><span> }</span><br><span> </span><br><span> void osmo_client_reconnect(struct osmo_pcap_client_conn *conn)</span><br><span>diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c</span><br><span>index 164b161..47ede72 100644</span><br><span>--- a/src/osmo_server_network.c</span><br><span>+++ b/src/osmo_server_network.c</span><br><span>@@ -120,8 +120,8 @@</span><br><span> </span><br><span> if (conn->curr_filename) {</span><br><span> client_event(conn, "closingtracefile", conn->curr_filename);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->ctrg->ctr[PEER_CTR_PROTATE]);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->server->ctrg->ctr[SERVER_CTR_PROTATE]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_PROTATE));</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_PROTATE));</span><br><span> talloc_free(conn->curr_filename);</span><br><span> conn->curr_filename = NULL;</span><br><span> }</span><br><span>@@ -422,12 +422,12 @@</span><br><span> conn->pend = sizeof(*conn->data);</span><br><span> </span><br><span> /* count the full packet we got */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->ctrg->ctr[PEER_CTR_PKTS]);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->server->ctrg->ctr[SERVER_CTR_PKTS]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_PKTS));</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_PKTS));</span><br><span> </span><br><span> /* count the bytes of it */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_add(&conn->ctrg->ctr[PEER_CTR_BYTES], conn->data->len);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_add(&conn->server->ctrg->ctr[SERVER_CTR_BYTES], conn->data->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(rate_ctr_group_get_ctr(conn->ctrg, PEER_CTR_BYTES), conn->data->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(rate_ctr_group_get_ctr(conn->server->ctrg, SERVER_CTR_BYTES), conn->data->len);</span><br><span> </span><br><span> switch (conn->data->type) {</span><br><span> case PKT_LINK_HDR:</span><br><span>@@ -520,7 +520,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&client->ctrg->ctr[PEER_CTR_CONNECT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(client->ctrg, PEER_CTR_CONNECT));</span><br><span> </span><br><span> client->state = STATE_INITIAL;</span><br><span> client->pend = sizeof(*client->data);</span><br><span>@@ -565,7 +565,7 @@</span><br><span> server = fd->data;</span><br><span> </span><br><span> /* count any accept to see no clients */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&server->ctrg->ctr[SERVER_CTR_CONNECT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(server->ctrg, SERVER_CTR_CONNECT));</span><br><span> </span><br><span> llist_for_each_entry(conn, &server->conn, entry) {</span><br><span> if (conn->remote_addr.s_addr == addr.sin_addr.s_addr) {</span><br><span>@@ -577,7 +577,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&server->ctrg->ctr[SERVER_CTR_NOCLIENT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(server->ctrg, SERVER_CTR_NOCLIENT));</span><br><span> </span><br><span> /*</span><br><span> * TODO: In the future start with a tls handshake and see if we know</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/24556">change 24556</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcap/+/24556"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic860db04489e9ee7312edb008497186116f30bfc </div>
<div style="display:none"> Gerrit-Change-Number: 24556 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>