<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25153">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add counters: pcu.sgsn.N.rx_paging_{cs,ps}<br><br>Related: SYS#4878<br>Change-Id: Iefba6f3d29c69fd4865c084bd9cf1a3a78f5c202<br>---<br>M src/gprs_bssgp_pcu.c<br>M src/gprs_bssgp_pcu.h<br>2 files changed, 29 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/25153/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c</span><br><span>index e2f6f51..1fcacdb 100644</span><br><span>--- a/src/gprs_bssgp_pcu.c</span><br><span>+++ b/src/gprs_bssgp_pcu.c</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_23_003.h></span><br><span> #include <osmocom/gprs/protocol/gsm_08_16.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/stats.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include "coding_scheme.h"</span><br><span> #include "tbf_dl.h"</span><br><span>@@ -53,6 +54,19 @@</span><br><span> extern uint16_t spoof_mcc, spoof_mnc;</span><br><span> extern bool spoof_mnc_3_digits;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc sgsn_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [SGSN_CTR_RX_PAGING_CS] = { "rx_paging_cs", "Amount of paging CS requests received" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [SGSN_CTR_RX_PAGING_PS] = { "rx_paging_ps", "Amount of paging PS requests received" },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_group_desc sgsn_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "pcu:sgsn",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_description = "SGSN Statistics",</span><br><span style="color: hsl(120, 100%, 40%);">+ .class_id = OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_ctr = ARRAY_SIZE(sgsn_ctr_description),</span><br><span style="color: hsl(120, 100%, 40%);">+ .ctr_desc = sgsn_ctr_description,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void bvc_timeout(void *_priv);</span><br><span> </span><br><span> static int parse_ra_cap(struct tlv_parsed *tp, MS_Radio_Access_capability_t *rac)</span><br><span>@@ -223,6 +237,8 @@</span><br><span> struct GprsMs *ms;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(the_pcu->bssgp.ctrs, SGSN_CTR_RX_PAGING_CS));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if ((rc = get_paging_cs_mi(&req, tp)) > 0)</span><br><span> return bssgp_tx_status((enum gprs_bssgp_cause) rc, NULL, msg);</span><br><span> </span><br><span>@@ -280,6 +296,8 @@</span><br><span> uint16_t pgroup;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(the_pcu->bssgp.ctrs, SGSN_CTR_RX_PAGING_PS));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!TLVP_PRESENT(tp, BSSGP_IE_IMSI)) {</span><br><span> LOGP(DBSSGP, LOGL_ERROR, "No IMSI\n");</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span>@@ -1288,11 +1306,15 @@</span><br><span> </span><br><span> osmo_timer_setup(&the_pcu->bssgp.bvc_timer, bvc_timeout, bts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->bssgp.ctrs = rate_ctr_group_alloc(the_pcu, &sgsn_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(the_pcu->bssgp.ctrs)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return &the_pcu->bssgp;</span><br><span> }</span><br><span> </span><br><span> void gprs_bssgp_destroy(struct gprs_rlcmac_bts *bts)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_free(the_pcu->bssgp.ctrs);</span><br><span> osmo_timer_del(&the_pcu->bssgp.bvc_timer);</span><br><span> </span><br><span> /* FIXME: blocking... */</span><br><span>diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h</span><br><span>index 6c6de1d..907e666 100644</span><br><span>--- a/src/gprs_bssgp_pcu.h</span><br><span>+++ b/src/gprs_bssgp_pcu.h</span><br><span>@@ -46,6 +46,11 @@</span><br><span> #define NS_HDR_LEN 4</span><br><span> #define IE_LLC_PDU 14</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum sgsn_counter_id {</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_CTR_RX_PAGING_CS,</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_CTR_RX_PAGING_PS,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gprs_bssgp_pcu {</span><br><span> struct bssgp_bvc_ctx *bctx;</span><br><span> </span><br><span>@@ -53,6 +58,8 @@</span><br><span> </span><br><span> struct osmo_timer_list bvc_timer;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *ctrs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* state: is the NSVC unblocked? */</span><br><span> int nsvc_unblocked;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25153">change 25153</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-pcu/+/25153"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iefba6f3d29c69fd4865c084bd9cf1a3a78f5c202 </div>
<div style="display:none"> Gerrit-Change-Number: 25153 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>