<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26068">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add chreq:successful_<reason> rate counters<br><br>Related: SYS#4878<br>Change-Id: I32c2c197a6199617a82986480b686c515fa40d62<br>---<br>M include/osmocom/bsc/bts.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/lchan_fsm.c<br>5 files changed, 65 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 68654f2..68e7cfe 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -27,6 +27,13 @@</span><br><span> BTS_CTR_CHREQ_ATTEMPTED_OTHER,</span><br><span> BTS_CTR_CHREQ_ATTEMPTED_UNKNOWN,</span><br><span> BTS_CTR_CHREQ_SUCCESSFUL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_EMERG,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_CALL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_LOCATION_UPD,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_PAG,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_PDCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_OTHER,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_CHREQ_SUCCESSFUL_UNKNOWN,</span><br><span> BTS_CTR_CHREQ_NO_CHANNEL,</span><br><span> BTS_CTR_CHREQ_MAX_DELAY_EXCEEDED,</span><br><span> BTS_CTR_CHAN_RF_FAIL,</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index cb56028..6a60f06 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -617,6 +617,8 @@</span><br><span> </span><br><span> struct lchan_activate_info {</span><br><span> enum lchan_activate_for activ_for;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If activ_for == ACTIVATE_FOR_MS_CHANNEL_REQUEST, the original CHREQ reason. */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_chreq_reason_t chreq_reason;</span><br><span> struct gsm_subscriber_connection *for_conn;</span><br><span> struct channel_mode_and_rate ch_mode_rate;</span><br><span> struct gsm_encr encr;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index c3825f6..cdd57c2 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -2097,6 +2097,7 @@</span><br><span> gsm_chreq_name(rqd->reason), rqd->ref.ra, rqd->ta);</span><br><span> info = (struct lchan_activate_info){</span><br><span> .activ_for = ACTIVATE_FOR_MS_CHANNEL_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ .chreq_reason = rqd->reason,</span><br><span> .ch_mode_rate = {</span><br><span> .chan_mode = GSM48_CMODE_SIGN,</span><br><span> .chan_rate = CH_RATE_SDCCH,</span><br><span>@@ -2112,6 +2113,35 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void imm_ass_rate_ctr(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL));</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->activate.info.chreq_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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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(rate_ctr_group_get_ctr(bts->bts_ctrs, 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 style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int rsl_tx_imm_assignment(struct gsm_lchan *lchan)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -2156,7 +2186,7 @@</span><br><span> rc = rsl_imm_assign_cmd(bts, sizeof(*ia)+ia->mob_alloc_len, (uint8_t *) ia);</span><br><span> </span><br><span> if (!rc)</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL));</span><br><span style="color: hsl(120, 100%, 40%);">+ imm_ass_rate_ctr(lchan);</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 21ee01a..28059bb 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -849,6 +849,27 @@</span><br><span> [BTS_CTR_CHREQ_SUCCESSFUL] = \</span><br><span> { "chreq:successful",</span><br><span> "Successful channel requests (immediate assign sent)" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_EMERG] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_emerg",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for EMERG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_CALL] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_call",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for CALL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_LOCATION_UPD] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_location_upd",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for LOCATION_UPD" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_PAG] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_pag",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for PAG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_PDCH] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_pdch",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for PDCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_OTHER] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_other",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for OTHER" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_CHREQ_SUCCESSFUL_UNKNOWN] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "chreq:successful_unknown",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Sent Immediate Assignment for UNKNOWN" },</span><br><span> [BTS_CTR_CHREQ_NO_CHANNEL] = \</span><br><span> { "chreq:no_channel",</span><br><span> "Sent to MS no channel available" },</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index d5d6e77..52aadce 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -632,6 +632,10 @@</span><br><span> lchan->release.requested = false;</span><br><span> </span><br><span> lchan->activate.info = *info;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* To avoid confusion, invalidate info.chreq_reason value if it isn't for a CHREQ */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.activ_for != ACTIVATE_FOR_MS_CHANNEL_REQUEST)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.info.chreq_reason = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> lchan->activate.concluded = false;</span><br><span> lchan_fsm_state_chg(LCHAN_ST_WAIT_TS_READY);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26068">change 26068</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/+/26068"/><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: I32c2c197a6199617a82986480b686c515fa40d62 </div>
<div style="display:none"> Gerrit-Change-Number: 26068 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>