<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24353">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove special case from assignment_count_result()<br><br>The single place that calls this special case is now actually doing the<br>exact same thing as the general case, and this is merely code dup.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: Ic62e8a48d3c88a1966086240a41732d169328491<br>---<br>M src/osmo-bsc/assignment_fsm.c<br>1 file changed, 13 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index aeb9a24..f294473 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -84,19 +84,17 @@</span><br><span> rate_ctr_inc(&conn->network->bsc_ctrs->ctr[BSC_##counter]); \</span><br><span> if (bts) { \</span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter]); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (BTS_##counter != BTS_CTR_ASSIGNMENT_NO_CHANNEL) { \</span><br><span style="color: hsl(0, 100%, 40%);">- switch (conn->assignment.req.ch_mode_rate_list[0].chan_mode) { \</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SIGN: \</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter##_SIGN]); \</span><br><span style="color: hsl(0, 100%, 40%);">- break; \</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_V1: \</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_EFR: \</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_AMR: \</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter##_SPEECH]); \</span><br><span style="color: hsl(0, 100%, 40%);">- break; \</span><br><span style="color: hsl(0, 100%, 40%);">- default: \</span><br><span style="color: hsl(0, 100%, 40%);">- break; \</span><br><span style="color: hsl(0, 100%, 40%);">- } \</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (conn->assignment.req.ch_mode_rate_list[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_##counter##_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_##counter##_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> } \</span><br><span> } \</span><br><span> } while(0)</span><br><span>@@ -458,8 +456,6 @@</span><br><span> OSMO_ASSERT(!conn->assignment.fi);</span><br><span> OSMO_ASSERT(!conn->assignment.new_lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- assignment_count(CTR_ASSIGNMENT_ATTEMPTED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> fi = osmo_fsm_inst_alloc_child(&assignment_fsm, conn->fi, GSCON_EV_ASSIGNMENT_END);</span><br><span> OSMO_ASSERT(fi);</span><br><span> conn->assignment.fi = fi;</span><br><span>@@ -469,6 +465,8 @@</span><br><span> conn->assignment.req = *req;</span><br><span> req = &conn->assignment.req;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ assignment_count(CTR_ASSIGNMENT_ATTEMPTED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Check if we need a voice stream. If yes, set the appropriate struct</span><br><span> * members in conn */</span><br><span> if (check_requires_voice_stream(conn) < 0)</span><br><span>@@ -544,18 +542,6 @@</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(0, 100%, 40%);">- switch (req->ch_mode_rate_list[0].chan_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN]);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH]);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24353">change 24353</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/+/24353"/><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: Ic62e8a48d3c88a1966086240a41732d169328491 </div>
<div style="display:none"> Gerrit-Change-Number: 24353 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: fixeria <vyanitskiy@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-MessageType: merged </div>