<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22267">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_avail(): omit logging for handover decision 2<br><br>Add bool log argument to lchan_avail_by_type() and omit logging when<br>passed as false. From handover_decision_2.c, pass 'log' as false, from<br>all other callers pass true, i.e. for unchanged behavior.<br><br>Rationale:<br><br>Usually, we use lchan_avail_by_type() to select a new lchan to initiate<br>actual service. For that, it is interesting to see how osmo-bsc decides<br>which lchan will be used.<br><br>For handover decision 2, we since recently call lchan_avail_by_type()<br>for each and every handover candidate, to determine whether it will<br>occupy a dynamic timeslot or not (to know whether we would congest the<br>other TCH kind). So this happens for each permutation of source lchan<br>and target cell. That produces a lot of logging, out of proportion of<br>being useful to the maintainer.<br><br>Change-Id: Ia403f8fc853ca9ea9e81f7a7395df6b23845ebed<br>---<br>M include/osmocom/bsc/lchan_select.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/handover_decision_2.c<br>M src/osmo-bsc/lchan_select.c<br>4 files changed, 25 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/lchan_select.h b/include/osmocom/bsc/lchan_select.h</span><br><span>index 41e7015..11f63b0 100644</span><br><span>--- a/include/osmocom/bsc/lchan_select.h</span><br><span>+++ b/include/osmocom/bsc/lchan_select.h</span><br><span>@@ -4,4 +4,4 @@</span><br><span> struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t type);</span><br><span> struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,</span><br><span> enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate);</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type, bool log);</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index a68c9fb..321bcb4 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -1610,12 +1610,12 @@</span><br><span> </span><br><span> /* First check the situation on the BTS, if we have TCH/H or TCH/F resources available for another (EMERGENCY)</span><br><span> * call. If yes, then no (further) action has to be carried out. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_F)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_F, true)) {</span><br><span> LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE,</span><br><span> "CHAN RQD/EMERGENCY-PRIORITY: at least one TCH/F is (now) available!\n");</span><br><span> return false;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_H)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_H, true)) {</span><br><span> LOG_BTS(rqd->bts, DRSL, LOGL_NOTICE,</span><br><span> "CHAN RQD/EMERGENCY-PRIORITY: at least one TCH/H is (now) available!\n");</span><br><span> return false;</span><br><span>diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c</span><br><span>index 92374e9..598f05b 100644</span><br><span>--- a/src/osmo-bsc/handover_decision_2.c</span><br><span>+++ b/src/osmo-bsc/handover_decision_2.c</span><br><span>@@ -921,7 +921,7 @@</span><br><span> c->target.min_free_tchh = ho_get_hodec2_tchh_min_slots(c->target.bts->ho);</span><br><span> </span><br><span> /* Would the next TCH/F lchan occupy a dynamic timeslot that currently counts for free TCH/H timeslots? */</span><br><span style="color: hsl(0, 100%, 40%);">- next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_F, false);</span><br><span> if (next_lchan && next_lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span> c->target.next_tchf_reduces_tchh = 2;</span><br><span> else</span><br><span>@@ -929,7 +929,7 @@</span><br><span> </span><br><span> /* Would the next TCH/H lchan occupy a dynamic timeslot that currently counts for free TCH/F timeslots?</span><br><span> * Note that a dyn TS already in TCH/H mode (half occupied) would not reduce free TCH/F. */</span><br><span style="color: hsl(0, 100%, 40%);">- next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_H);</span><br><span style="color: hsl(120, 100%, 40%);">+ next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_H, false);</span><br><span> if (next_lchan && next_lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH</span><br><span> && next_lchan->ts->pchan_is != GSM_PCHAN_TCH_H)</span><br><span> c->target.next_tchh_reduces_tchf = 1;</span><br><span>diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c</span><br><span>index 64f4939..626520c 100644</span><br><span>--- a/src/osmo-bsc/lchan_select.c</span><br><span>+++ b/src/osmo-bsc/lchan_select.c</span><br><span>@@ -32,13 +32,14 @@</span><br><span> </span><br><span> static struct gsm_lchan *</span><br><span> _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_phys_chan_config as_pchan, bool allow_pchan_switch)</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config as_pchan, bool allow_pchan_switch, bool log)</span><br><span> {</span><br><span> struct gsm_lchan *lchan;</span><br><span> struct gsm_bts_trx_ts *ts;</span><br><span> int j, start, stop, dir;</span><br><span> </span><br><span> #define LOGPLCHANALLOC(fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (log) \</span><br><span> LOGP(DRLL, LOGL_DEBUG, "looking for lchan %s%s%s%s: " fmt, \</span><br><span> gsm_pchan_name(pchan), \</span><br><span> pchan == as_pchan ? "" : " as ", \</span><br><span>@@ -103,7 +104,7 @@</span><br><span> </span><br><span> static struct gsm_lchan *</span><br><span> _lc_dyn_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_phys_chan_config dyn_as_pchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config dyn_as_pchan, bool log)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx;</span><br><span> struct gsm_lchan *lc;</span><br><span>@@ -119,13 +120,13 @@</span><br><span> for (allow_pchan_switch = 0; allow_pchan_switch <= (try_pchan_switch ? 1 : 0); allow_pchan_switch++) {</span><br><span> if (bts->chan_alloc_reverse) {</span><br><span> llist_for_each_entry_reverse(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- lc = _lc_find_trx(trx, pchan, dyn_as_pchan, (bool)allow_pchan_switch);</span><br><span style="color: hsl(120, 100%, 40%);">+ lc = _lc_find_trx(trx, pchan, dyn_as_pchan, (bool)allow_pchan_switch, log);</span><br><span> if (lc)</span><br><span> return lc;</span><br><span> }</span><br><span> } else {</span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- lc = _lc_find_trx(trx, pchan, dyn_as_pchan, (bool)allow_pchan_switch);</span><br><span style="color: hsl(120, 100%, 40%);">+ lc = _lc_find_trx(trx, pchan, dyn_as_pchan, (bool)allow_pchan_switch, log);</span><br><span> if (lc)</span><br><span> return lc;</span><br><span> }</span><br><span>@@ -136,9 +137,9 @@</span><br><span> }</span><br><span> </span><br><span> static struct gsm_lchan *</span><br><span style="color: hsl(0, 100%, 40%);">-_lc_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan)</span><br><span style="color: hsl(120, 100%, 40%);">+_lc_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan, bool log)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return _lc_dyn_find_bts(bts, pchan, pchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ return _lc_dyn_find_bts(bts, pchan, pchan, log);</span><br><span> }</span><br><span> </span><br><span> struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,</span><br><span>@@ -175,12 +176,13 @@</span><br><span> return lchan_select_by_type(bts, type);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type)</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type, bool log)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = NULL;</span><br><span> enum gsm_phys_chan_config first, first_cbch, second, second_cbch;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_avail_by_type(%s)\n", gsm_lchant_name(type));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (log)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_avail_by_type(%s)\n", gsm_lchant_name(type));</span><br><span> </span><br><span> switch (type) {</span><br><span> case GSM_LCHAN_SDCCH:</span><br><span>@@ -196,20 +198,20 @@</span><br><span> second_cbch = GSM_PCHAN_SDCCH8_SACCH8C_CBCH;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, first);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_find_bts(bts, first, log);</span><br><span> if (lchan == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, first_cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_find_bts(bts, first_cbch, log);</span><br><span> if (lchan == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, second);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_find_bts(bts, second, log);</span><br><span> if (lchan == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, second_cbch);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_find_bts(bts, second_cbch, log);</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F, log);</span><br><span> /* If we don't have TCH/F available, try dynamic TCH/F_PDCH */</span><br><span> if (!lchan) {</span><br><span> lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_PCHAN_TCH_F, log);</span><br><span> /* TCH/F_PDCH used as TCH/F -- here, type is already</span><br><span> * set to GSM_LCHAN_TCH_F, but for clarity's sake... */</span><br><span> if (lchan)</span><br><span>@@ -220,19 +222,19 @@</span><br><span> if (!lchan && bts->network->dyn_ts_allow_tch_f) {</span><br><span> lchan = _lc_dyn_find_bts(bts,</span><br><span> GSM_PCHAN_TCH_F_TCH_H_PDCH,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_PCHAN_TCH_F, log);</span><br><span> if (lchan)</span><br><span> type = GSM_LCHAN_TCH_F;</span><br><span> }</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H, log);</span><br><span> /* No dedicated TCH/x available -- try fully dynamic</span><br><span> * TCH/F_TCH/H_PDCH */</span><br><span> if (!lchan) {</span><br><span> lchan = _lc_dyn_find_bts(bts,</span><br><span> GSM_PCHAN_TCH_F_TCH_H_PDCH,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_PCHAN_TCH_H, log);</span><br><span> if (lchan)</span><br><span> type = GSM_LCHAN_TCH_H;</span><br><span> }</span><br><span>@@ -251,7 +253,7 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan = lchan_avail_by_type(bts, type);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = lchan_avail_by_type(bts, type, true);</span><br><span> </span><br><span> LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_select_by_type(%s)\n", gsm_lchant_name(type));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22267">change 22267</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/+/22267"/><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: Ia403f8fc853ca9ea9e81f7a7395df6b23845ebed </div>
<div style="display:none"> Gerrit-Change-Number: 22267 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: 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>