<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24907">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Aggregate NSVC stats inside the NSE<br><br>Change-Id: Ifa3c85ec52bda14596e9d7a8705baa1fd4ee2010<br>Related: OS#4998<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_message.c<br>M src/gb/gprs_ns2_vc_fsm.c<br>4 files changed, 45 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/24907/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 3eb59e5..fb2965a 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -159,7 +159,7 @@</span><br><span>    { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct rate_ctr_desc nsvc_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc ns_ctr_description[] = {</span><br><span>        [NS_CTR_PKTS_IN]        = { "packets:in",     "Packets at NS Level  ( In)" },</span><br><span>    [NS_CTR_PKTS_OUT]       = { "packets:out",    "Packets at NS Level  (Out)" },</span><br><span>    [NS_CTR_PKTS_OUT_DROP]  = { "packets:out:drop",       "Dropped Packets      (Out)" },</span><br><span>@@ -177,11 +177,19 @@</span><br><span>    [NS_CTR_LOST_RESET]     = { "lost:reset",     "RESET ACK missing count   " },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_group_desc nse_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+        .group_name_prefix = "ns:nse",</span><br><span style="color: hsl(120, 100%, 40%);">+      .group_description = "NSE Peer Statistics",</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_ctr = ARRAY_SIZE(ns_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+    .ctr_desc = ns_ctr_description,</span><br><span style="color: hsl(120, 100%, 40%);">+       .class_id = OSMO_STATS_CLASS_PEER,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct rate_ctr_group_desc nsvc_ctrg_desc = {</span><br><span>       .group_name_prefix = "ns:nsvc",</span><br><span>    .group_description = "NSVC Peer Statistics",</span><br><span style="color: hsl(0, 100%, 40%);">-  .num_ctr = ARRAY_SIZE(nsvc_ctr_description),</span><br><span style="color: hsl(0, 100%, 40%);">-    .ctr_desc = nsvc_ctr_description,</span><br><span style="color: hsl(120, 100%, 40%);">+     .num_ctr = ARRAY_SIZE(ns_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+    .ctr_desc = ns_ctr_description,</span><br><span>      .class_id = OSMO_STATS_CLASS_PEER,</span><br><span> };</span><br><span> </span><br><span>@@ -806,6 +814,12 @@</span><br><span>          return NULL;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ nse->ctrg = rate_ctr_group_alloc(nse, &nse_ctrg_desc, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!nse->ctrg) {</span><br><span style="color: hsl(120, 100%, 40%);">+          talloc_free(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+             return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  nse->ll = linklayer;</span><br><span>      nse->nsei = nsei;</span><br><span>         nse->nsi = nsi;</span><br><span>@@ -886,6 +900,7 @@</span><br><span> </span><br><span>         gprs_ns2_free_nsvcs(nse);</span><br><span>    ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+        rate_ctr_group_free(nse->ctrg);</span><br><span> </span><br><span>       llist_del(&nse->list);</span><br><span>        talloc_free(nse);</span><br><span>@@ -1265,8 +1280,8 @@</span><br><span>    log_set_context(LOG_CTX_GB_NSE, nsvc->nse);</span><br><span>       log_set_context(LOG_CTX_GB_NSVC, nsvc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     rate_ctr_inc(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_PKTS_IN));</span><br><span style="color: hsl(0, 100%, 40%);">-    rate_ctr_add(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_BYTES_IN), msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+    RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_IN);</span><br><span style="color: hsl(120, 100%, 40%);">+        RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_IN, msg->len);</span><br><span> </span><br><span>     if (msg->len < sizeof(struct gprs_ns_hdr)) {</span><br><span>           rc = -EINVAL;</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 70e212a..db01c2e 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -38,6 +38,20 @@</span><br><span> #define LOG_NS_RX_SIGNAL(nsvc, pdu_type) LOG_NS_SIGNAL(nsvc, "Rx", pdu_type, LOGL_INFO, "\n")</span><br><span> #define LOG_NS_TX_SIGNAL(nsvc, pdu_type) LOG_NS_SIGNAL(nsvc, "Tx", pdu_type, LOGL_INFO, "\n")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define RATE_CTR_INC_NS(nsvc, ctr) \</span><br><span style="color: hsl(120, 100%, 40%);">+   do { \</span><br><span style="color: hsl(120, 100%, 40%);">+                struct gprs_ns2_vc *_nsvc = (nsvc); \</span><br><span style="color: hsl(120, 100%, 40%);">+         rate_ctr_inc(rate_ctr_group_get_ctr(_nsvc->ctrg, ctr)); \</span><br><span style="color: hsl(120, 100%, 40%);">+          rate_ctr_inc(rate_ctr_group_get_ctr(_nsvc->nse->ctrg, ctr)); \</span><br><span style="color: hsl(120, 100%, 40%);">+  } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define RATE_CTR_ADD_NS(nsvc, ctr, val) \</span><br><span style="color: hsl(120, 100%, 40%);">+      do { \</span><br><span style="color: hsl(120, 100%, 40%);">+                struct gprs_ns2_vc *_nsvc = (nsvc); \</span><br><span style="color: hsl(120, 100%, 40%);">+         rate_ctr_add(rate_ctr_group_get_ctr(_nsvc->ctrg, ctr), val); \</span><br><span style="color: hsl(120, 100%, 40%);">+             rate_ctr_add(rate_ctr_group_get_ctr(_nsvc->nse->ctrg, ctr), val); \</span><br><span style="color: hsl(120, 100%, 40%);">+     } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> struct osmo_fsm_inst;</span><br><span> struct tlv_parsed;</span><br><span>@@ -198,6 +212,9 @@</span><br><span> </span><br><span>   /*! are we implementing the SGSN role? */</span><br><span>    bool ip_sns_role_sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      /*! NSE-wide statistics */</span><br><span style="color: hsl(120, 100%, 40%);">+    struct rate_ctr_group *ctrg;</span><br><span> };</span><br><span> </span><br><span> /*! Structure representing a single NS-VC */</span><br><span>diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c</span><br><span>index 03e26bd..dccf51d 100644</span><br><span>--- a/src/gb/gprs_ns2_message.c</span><br><span>+++ b/src/gb/gprs_ns2_message.c</span><br><span>@@ -174,11 +174,11 @@</span><br><span> </span><br><span>  rc = nsvc->bind->send_vc(nsvc, msg);</span><br><span>   if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                rate_ctr_inc(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_PKTS_OUT_DROP));</span><br><span style="color: hsl(0, 100%, 40%);">-              rate_ctr_add(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_BYTES_OUT_DROP), bytes);</span><br><span style="color: hsl(120, 100%, 40%);">+            RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP);</span><br><span style="color: hsl(120, 100%, 40%);">+          RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, bytes);</span><br><span>         } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                rate_ctr_inc(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_PKTS_OUT));</span><br><span style="color: hsl(0, 100%, 40%);">-           rate_ctr_add(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_BYTES_OUT), bytes);</span><br><span style="color: hsl(120, 100%, 40%);">+         RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT);</span><br><span style="color: hsl(120, 100%, 40%);">+               RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, bytes);</span><br><span>      }</span><br><span> </span><br><span>        return rc;</span><br><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index 05118b2..4dc0536 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -230,7 +230,7 @@</span><br><span>                osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);</span><br><span>               break;</span><br><span>       case NS_TOUT_TNS_ALIVE:</span><br><span style="color: hsl(0, 100%, 40%);">-         rate_ctr_inc(rate_ctr_group_get_ctr(priv->nsvc->ctrg, NS_CTR_LOST_ALIVE));</span><br><span style="color: hsl(120, 100%, 40%);">+              RATE_CTR_INC_NS(priv->nsvc, NS_CTR_LOST_ALIVE);</span><br><span>           priv->alive.N++;</span><br><span> </span><br><span>              if (priv->alive.N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) {</span><br><span>@@ -336,7 +336,7 @@</span><br><span> </span><br><span>   if (old_state != GPRS_NS2_ST_BLOCKED) {</span><br><span>              priv->N = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-         rate_ctr_inc(rate_ctr_group_get_ctr(priv->nsvc->ctrg, NS_CTR_BLOCKED));</span><br><span style="color: hsl(120, 100%, 40%);">+         RATE_CTR_INC_NS(priv->nsvc, NS_CTR_BLOCKED);</span><br><span>      }</span><br><span> </span><br><span>        ns2_nse_notify_unblocked(priv->nsvc, false);</span><br><span>@@ -412,7 +412,7 @@</span><br><span>        struct gprs_ns2_nse *nse = nsvc->nse;</span><br><span> </span><br><span>         if (old_state != GPRS_NS2_ST_UNBLOCKED)</span><br><span style="color: hsl(0, 100%, 40%);">-         rate_ctr_inc(rate_ctr_group_get_ctr(nsvc->ctrg, NS_CTR_UNBLOCKED));</span><br><span style="color: hsl(120, 100%, 40%);">+                RATE_CTR_INC_NS(nsvc, NS_CTR_UNBLOCKED);</span><br><span> </span><br><span>         priv->accept_unitdata = true;</span><br><span>     ns2_nse_notify_unblocked(nsvc, true);</span><br><span>@@ -527,7 +527,7 @@</span><br><span>  switch (fi->state) {</span><br><span>      case GPRS_NS2_ST_RESET:</span><br><span>              if (priv->initiate_reset) {</span><br><span style="color: hsl(0, 100%, 40%);">-                  rate_ctr_inc(rate_ctr_group_get_ctr(priv->nsvc->ctrg, NS_CTR_LOST_RESET));</span><br><span style="color: hsl(120, 100%, 40%);">+                      RATE_CTR_INC_NS(priv->nsvc, NS_CTR_LOST_RESET);</span><br><span>                   priv->N++;</span><br><span>                        if (priv->N <= nsi->timeout[NS_TOUT_TNS_RESET_RETRIES]) {</span><br><span>                           osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24907">change 24907</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/libosmocore/+/24907"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifa3c85ec52bda14596e9d7a8705baa1fd4ee2010 </div>
<div style="display:none"> Gerrit-Change-Number: 24907 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>