<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21988">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hodec2: add ho_candidate.{current,target}.free_tch<br><br>Store the number of free lchans and the min-free-slots settings in<br>ho_candidate, instead of figuring those out in various places, to make<br>it easier to read.<br><br>Prepare for upcoming patch which also requires these values to fix a<br>bug.<br><br>Change-Id: Ie6ca5af5e8d0ebb8deaaaa637e2728008ecba517<br>---<br>M src/osmo-bsc/handover_decision_2.c<br>1 file changed, 46 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c</span><br><span>index 4cf0e8a..b296bd1 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>@@ -104,6 +104,8 @@</span><br><span> struct gsm_lchan *lchan;</span><br><span> struct gsm_bts *bts;</span><br><span> int rxlev;</span><br><span style="color: hsl(120, 100%, 40%);">+ int free_tch;</span><br><span style="color: hsl(120, 100%, 40%);">+ int min_free_tch;</span><br><span> } current;</span><br><span> struct {</span><br><span> struct neighbor_ident_key nik; /* neighbor ARFCN+BSIC */</span><br><span>@@ -111,6 +113,10 @@</span><br><span> struct gsm_bts *bts;</span><br><span> int rxlev;</span><br><span> int rxlev_afs_bias;</span><br><span style="color: hsl(120, 100%, 40%);">+ int free_tchf;</span><br><span style="color: hsl(120, 100%, 40%);">+ int min_free_tchf;</span><br><span style="color: hsl(120, 100%, 40%);">+ int free_tchh;</span><br><span style="color: hsl(120, 100%, 40%);">+ int min_free_tchh;</span><br><span> } target;</span><br><span> };</span><br><span> </span><br><span>@@ -433,9 +439,8 @@</span><br><span> * * The number of free slots are checked for TCH/F and TCH/H slot types</span><br><span> * individually.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static void check_requirements(struct ho_candidate *c, int tchf_count, int tchh_count)</span><br><span style="color: hsl(120, 100%, 40%);">+static void check_requirements(struct ho_candidate *c)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int count;</span><br><span> uint8_t requirement = 0;</span><br><span> unsigned int penalty_time;</span><br><span> c->requirements = 0;</span><br><span>@@ -521,12 +526,12 @@</span><br><span> }</span><br><span> </span><br><span> /* remove slot types that are not available */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tchf_count && requirement & REQUIREMENT_A_TCHF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!c->target.free_tchf && (requirement & REQUIREMENT_A_TCHF)) {</span><br><span> LOGPHOLCHANTOBTS(c->current.lchan, c->target.bts, LOGL_DEBUG,</span><br><span> "removing TCH/F, since all TCH/F lchans are in use\n");</span><br><span> requirement &= ~(REQUIREMENT_A_TCHF);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tchh_count && requirement & REQUIREMENT_A_TCHH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!c->target.free_tchh && (requirement & REQUIREMENT_A_TCHH)) {</span><br><span> LOGPHOLCHANTOBTS(c->current.lchan, c->target.bts, LOGL_DEBUG,</span><br><span> "removing TCH/H, since all TCH/H lchans are in use\n");</span><br><span> requirement &= ~(REQUIREMENT_A_TCHH);</span><br><span>@@ -610,11 +615,11 @@</span><br><span> /* the minimum free timeslots that are defined for this cell must</span><br><span> * be maintained _after_ handover/assignment */</span><br><span> if (requirement & REQUIREMENT_A_TCHF) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (tchf_count - 1 >= ho_get_hodec2_tchf_min_slots(c->target.bts->ho))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c->target.free_tchf - 1 >= c->target.min_free_tchf)</span><br><span> requirement |= REQUIREMENT_B_TCHF;</span><br><span> }</span><br><span> if (requirement & REQUIREMENT_A_TCHH) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (tchh_count - 1 >= ho_get_hodec2_tchh_min_slots(c->target.bts->ho))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c->target.free_tchh - 1 >= c->target.min_free_tchh)</span><br><span> requirement |= REQUIREMENT_B_TCHH;</span><br><span> }</span><br><span> </span><br><span>@@ -622,15 +627,12 @@</span><br><span> </span><br><span> /* the nr of free timeslots of the target cell must be >= the</span><br><span> * free slots of the current cell _after_ handover/assignment */</span><br><span style="color: hsl(0, 100%, 40%);">- count = bts_count_free_ts(c->current.bts,</span><br><span style="color: hsl(0, 100%, 40%);">- (c->current.lchan->type == GSM_LCHAN_TCH_H) ?</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_H : GSM_PCHAN_TCH_F);</span><br><span> if (requirement & REQUIREMENT_A_TCHF) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (tchf_count - 1 >= count + 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c->target.free_tchf - 1 >= c->current.free_tch + 1)</span><br><span> requirement |= REQUIREMENT_C_TCHF;</span><br><span> }</span><br><span> if (requirement & REQUIREMENT_A_TCHH) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (tchh_count - 1 >= count + 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c->target.free_tchh - 1 >= c->current.free_tch + 1)</span><br><span> requirement |= REQUIREMENT_C_TCHH;</span><br><span> }</span><br><span> </span><br><span>@@ -826,12 +828,11 @@</span><br><span> " less-or-equal congestion"))</span><br><span> </span><br><span> /* verbosely log about a handover candidate */</span><br><span style="color: hsl(0, 100%, 40%);">-static inline void debug_candidate(struct ho_candidate *candidate,</span><br><span style="color: hsl(0, 100%, 40%);">- int tchf_count, int tchh_count)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline void debug_candidate(struct ho_candidate *candidate)</span><br><span> {</span><br><span> #define HO_CANDIDATE_FMT(tchx, TCHX) "TCH/" #TCHX "={free %d (want %d), " REQUIREMENTS_FMT "}"</span><br><span> #define HO_CANDIDATE_ARGS(tchx, TCHX) \</span><br><span style="color: hsl(0, 100%, 40%);">- tch##tchx##_count, ho_get_hodec2_tch##tchx##_min_slots(candidate->target.bts->ho), \</span><br><span style="color: hsl(120, 100%, 40%);">+ candidate->target.free_tch##tchx, candidate->target.min_free_tch##tchx, \</span><br><span> REQUIREMENTS_ARGS(candidate->requirements, TCHX)</span><br><span> </span><br><span> if (!candidate->target.bts && !candidate->target.cil)</span><br><span>@@ -858,17 +859,32 @@</span><br><span> HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void candidate_set_free_tch(struct ho_candidate *c)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ c->current.free_tch = bts_count_free_ts(c->current.bts, c->current.lchan->ts->pchan_is);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (c->current.lchan->ts->pchan_is) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ c->current.min_free_tch = ho_get_hodec2_tchf_min_slots(c->current.bts->ho);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ c->current.min_free_tch = ho_get_hodec2_tchh_min_slots(c->current.bts->ho);</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 style="color: hsl(120, 100%, 40%);">+ c->target.free_tchf = bts_count_free_ts(c->target.bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ c->target.min_free_tchf = ho_get_hodec2_tchf_min_slots(c->target.bts->ho);</span><br><span style="color: hsl(120, 100%, 40%);">+ c->target.free_tchh = bts_count_free_ts(c->target.bts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(120, 100%, 40%);">+ c->target.min_free_tchh = ho_get_hodec2_tchh_min_slots(c->target.bts->ho);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* add candidate for re-assignment within the current cell */</span><br><span> static void collect_assignment_candidate(struct gsm_lchan *lchan, struct ho_candidate *clist,</span><br><span> unsigned int *candidates, int rxlev_current)</span><br><span> {</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- int tchf_count, tchh_count;</span><br><span> struct ho_candidate c;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tchf_count = bts_count_free_ts(bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(0, 100%, 40%);">- tchh_count = bts_count_free_ts(bts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> c = (struct ho_candidate){</span><br><span> .current = {</span><br><span> .lchan = lchan,</span><br><span>@@ -880,9 +896,10 @@</span><br><span> .rxlev = rxlev_current, /* same cell, same rxlev */</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- check_requirements(&c, tchf_count, tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ candidate_set_free_tch(&c);</span><br><span style="color: hsl(120, 100%, 40%);">+ check_requirements(&c);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- debug_candidate(&c, tchf_count, tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ debug_candidate(&c);</span><br><span> </span><br><span> if (!c.requirements)</span><br><span> return;</span><br><span>@@ -898,8 +915,6 @@</span><br><span> int *neighbors_count)</span><br><span> {</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- int tchf_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int tchh_count = 0;</span><br><span> struct gsm_bts *neighbor_bts;</span><br><span> const struct gsm0808_cell_id_list2 *neighbor_cil;</span><br><span> struct neighbor_ident_key ni = {</span><br><span>@@ -958,6 +973,7 @@</span><br><span> .rxlev = neigh_meas_avg(nmp, ho_get_hodec2_rxlev_neigh_avg_win(bts->ho)),</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ candidate_set_free_tch(&c);</span><br><span> </span><br><span> /* Heed rxlev hysteresis only if the RXLEV/RXQUAL/TA levels of the MS aren't critically bad and</span><br><span> * we're just looking for an improvement. If levels are critical, we desperately need a handover</span><br><span>@@ -985,13 +1001,11 @@</span><br><span> }</span><br><span> </span><br><span> if (neighbor_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- tchf_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(0, 100%, 40%);">- tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(0, 100%, 40%);">- check_requirements(&c, tchf_count, tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ check_requirements(&c);</span><br><span> } else</span><br><span> check_requirements_remote_bss(&c);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- debug_candidate(&c, tchf_count, tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ debug_candidate(&c);</span><br><span> </span><br><span> if (!c.requirements)</span><br><span> return;</span><br><span>@@ -1751,7 +1765,7 @@</span><br><span> static void bts_congestion_check(struct gsm_bts *bts)</span><br><span> {</span><br><span> int min_free_tchf, min_free_tchh;</span><br><span style="color: hsl(0, 100%, 40%);">- int tchf_count, tchh_count;</span><br><span style="color: hsl(120, 100%, 40%);">+ int free_tchf, free_tchh;</span><br><span> </span><br><span> global_ho_reason = HO_REASON_CONGESTION;</span><br><span> </span><br><span>@@ -1777,19 +1791,19 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tchf_count = bts_count_free_ts(bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(0, 100%, 40%);">- tchh_count = bts_count_free_ts(bts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(120, 100%, 40%);">+ free_tchf = bts_count_free_ts(bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ free_tchh = bts_count_free_ts(bts, GSM_PCHAN_TCH_H);</span><br><span> LOGPHOBTS(bts, LOGL_INFO, "Congestion check: (free/want-free) TCH/F=%d/%d TCH/H=%d/%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tchf_count, min_free_tchf, tchh_count, min_free_tchh);</span><br><span style="color: hsl(120, 100%, 40%);">+ free_tchf, min_free_tchf, free_tchh, min_free_tchh);</span><br><span> </span><br><span> /* only check BTS if congested */</span><br><span style="color: hsl(0, 100%, 40%);">- if (tchf_count >= min_free_tchf && tchh_count >= min_free_tchh) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (free_tchf >= min_free_tchf && free_tchh >= min_free_tchh) {</span><br><span> LOGPHOBTS(bts, LOGL_DEBUG, "Not congested\n");</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> LOGPHOBTS(bts, LOGL_DEBUG, "Attempting to resolve congestion...\n");</span><br><span style="color: hsl(0, 100%, 40%);">- bts_resolve_congestion(bts, min_free_tchf - tchf_count, min_free_tchh - tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_resolve_congestion(bts, min_free_tchf - free_tchf, min_free_tchh - free_tchh);</span><br><span> }</span><br><span> </span><br><span> void hodec2_congestion_check(struct gsm_network *net)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21988">change 21988</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/+/21988"/><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: Ie6ca5af5e8d0ebb8deaaaa637e2728008ecba517 </div>
<div style="display:none"> Gerrit-Change-Number: 21988 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>