<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22103">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: Add granularity to SDCCH/TCH/LU activity.<br><br>Change-Id: I4df275e4770c5ff3643c79ba828e736986f8bb47<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/osmo_bsc_filter.c<br>5 files changed, 123 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index c79e7f7..8f3e05b 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -18,6 +18,13 @@</span><br><span> </span><br><span> enum bts_counter_id {</span><br><span> BTS_CTR_CHREQ_TOTAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_EMERG,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_CALL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_LOCATION_UPD,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_PAG,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_PDCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_OTHER,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_ATTEMPTED_UNKNOWN,</span><br><span> BTS_CTR_CHREQ_SUCCESSFUL,</span><br><span> BTS_CTR_CHREQ_NO_CHANNEL,</span><br><span> BTS_CTR_CHAN_RF_FAIL,</span><br><span>@@ -36,6 +43,8 @@</span><br><span> BTS_CTR_PAGING_NO_ACTIVE_PAGING,</span><br><span> BTS_CTR_PAGING_MSC_FLUSH,</span><br><span> BTS_CTR_CHAN_ACT_TOTAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHAN_ACT_SDCCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHAN_ACT_TCH,</span><br><span> BTS_CTR_CHAN_ACT_NACK,</span><br><span> BTS_CTR_RSL_UNKNOWN,</span><br><span> BTS_CTR_RSL_IPA_NACK,</span><br><span>@@ -68,9 +77,15 @@</span><br><span> BTS_CTR_ASSIGNMENT_COMPLETED,</span><br><span> BTS_CTR_ASSIGNMENT_STOPPED,</span><br><span> BTS_CTR_ASSIGNMENT_NO_CHANNEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH,</span><br><span> BTS_CTR_ASSIGNMENT_TIMEOUT,</span><br><span> BTS_CTR_ASSIGNMENT_FAILED,</span><br><span> BTS_CTR_ASSIGNMENT_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_LOCATION_UPDATE_ACCEPT,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_LOCATION_UPDATE_REJECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_LOCATION_UPDATE_DETACH,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_LOCATION_UPDATE_UNKNOWN,</span><br><span> BTS_CTR_HANDOVER_ATTEMPTED,</span><br><span> BTS_CTR_HANDOVER_COMPLETED,</span><br><span> BTS_CTR_HANDOVER_STOPPED,</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 2142219..a68c9fb 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -613,6 +613,17 @@</span><br><span> msg->dst = trx->rsl_link;</span><br><span> </span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_SDCCH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TCH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -1511,6 +1522,29 @@</span><br><span> get_value_string(gsm_chreq_descs, rqd->reason), rqd->ref.ra, bts->network->neci, rqd->reason);</span><br><span> </span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_TOTAL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (rqd->reason) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_CHREQ_REASON_EMERG:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_EMERG]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_CHREQ_REASON_CALL:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_CALL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_CHREQ_REASON_LOCATION_UPD:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_LOCATION_UPD]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_CHREQ_REASON_PAG:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_PAG]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_CHREQ_REASON_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_PDCH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_CHREQ_REASON_OTHER:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_OTHER]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_ATTEMPTED_UNKNOWN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Enqueue request */</span><br><span> llist_add_tail(&rqd->entry, &bts->chan_rqd_queue);</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index 7db37b2..6dba214 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -506,6 +506,18 @@</span><br><span> * down the assignment in case of failure. */</span><br><span> if (!conn->assignment.new_lchan) {</span><br><span> assignment_count_result(CTR_ASSIGNMENT_NO_CHANNEL);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (req->ch_mode_rate[0].chan_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> assignment_fail(GSM0808_CAUSE_NO_RADIO_RESOURCE_AVAILABLE,</span><br><span> "BSSMAP Assignment Command:"</span><br><span> " No lchan available for: pref=%s:%s / alt1=%s:%s / alt2=%s:%s\n",</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 0774721..3fa4f24 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -761,6 +761,27 @@</span><br><span> [BTS_CTR_CHREQ_TOTAL] = \</span><br><span> { "chreq:total",</span><br><span> "Received channel requests" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_EMERG] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_emerg",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests EMERG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_CALL] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_call",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests CALL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_LOCATION_UPD] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_location_upd",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests LOCATION_UPD" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_PAG] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_pag",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests PAG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_PDCH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_pdch",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests PDCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_OTHER] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_other",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests OTHER" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_ATTEMPTED_UNKNOWN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:attempted_unknown",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received channel requests UNKNOWN" },</span><br><span> [BTS_CTR_CHREQ_SUCCESSFUL] = \</span><br><span> { "chreq:successful",</span><br><span> "Successful channel requests (immediate assign sent)" },</span><br><span>@@ -815,6 +836,12 @@</span><br><span> [BTS_CTR_CHAN_ACT_TOTAL] = \</span><br><span> { "chan_act:total",</span><br><span> "Total number of Channel Activations" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHAN_ACT_SDCCH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chan_act:sdcch",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of SDCCH Channel Activations" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHAN_ACT_TCH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chan_act:tch",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of TCH Channel Activations" },</span><br><span> [BTS_CTR_CHAN_ACT_NACK] = \</span><br><span> { "chan_act:nack",</span><br><span> "Number of Channel Activations that the BTS NACKed" },</span><br><span>@@ -913,6 +940,12 @@</span><br><span> [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = \</span><br><span> { "assignment:no_channel",</span><br><span> "Failure to allocate lchan for Assignment" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:no_channel_sign",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failure to allocate signaling lchan for Assignment" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:no_channel_speech",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failure to allocate speech lchan for Assignment" },</span><br><span> [BTS_CTR_ASSIGNMENT_TIMEOUT] = \</span><br><span> { "assignment:timeout",</span><br><span> "Assignment timed out" },</span><br><span>@@ -922,7 +955,18 @@</span><br><span> [BTS_CTR_ASSIGNMENT_ERROR] = \</span><br><span> { "assignment:error",</span><br><span> "Assignment failed for other reason" },</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_LOCATION_UPDATE_ACCEPT] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "location_update:accept",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Location Update Accept" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_LOCATION_UPDATE_REJECT] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "location_update:reject",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Location Update Reject" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_LOCATION_UPDATE_DETACH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "location_update:detach",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Location Update Detach" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_LOCATION_UPDATE_UNKNOWN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "location_update:unknown",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Location Update UNKNOWN" },</span><br><span> [BTS_CTR_HANDOVER_ATTEMPTED] = \</span><br><span> { "handover:attempted",</span><br><span> "Intra-BSC handover attempts" },</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>index 497b3e4..0187a75 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>@@ -119,5 +119,22 @@</span><br><span> bsc_patch_mm_info(conn, &gh->data[0], length);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn && conn->lchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mtype) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_MT_MM_LOC_UPD_ACCEPT:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_MT_MM_LOC_UPD_REJECT:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_MT_MM_IMSI_DETACH_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22103">change 22103</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-bsc/+/22103"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4df275e4770c5ff3643c79ba828e736986f8bb47 </div>
<div style="display:none"> Gerrit-Change-Number: 22103 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: iedemam <michael@kapsulate.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>