<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11320">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_decision_2.c: refactor trigger_*()<br><br>a) Prepare for triggering handover for any candidate, remote or local.<br><br>b) drop redundant arguments.<br><br>Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef<br>---<br>M src/osmo-bsc/handover_decision_2.c<br>1 file changed, 18 insertions(+), 17 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 64fc2dd..457d57a 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>@@ -620,8 +620,10 @@</span><br><span> }</span><br><span> </span><br><span> /* Trigger handover or assignment depending on the target BTS */</span><br><span style="color: hsl(0, 100%, 40%);">-static int trigger_handover_or_assignment(struct gsm_lchan *lchan, struct gsm_bts *new_bts, uint8_t requirements)</span><br><span style="color: hsl(120, 100%, 40%);">+static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = c->lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *new_bts = c->bts;</span><br><span> struct handover_out_req req;</span><br><span> struct gsm_bts *current_bts = lchan->ts->trx->bts;</span><br><span> int afs_bias = 0;</span><br><span>@@ -699,6 +701,14 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int trigger_ho(struct ho_candidate *c, uint8_t requirements)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c->bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ return trigger_local_ho_or_as(c, requirements);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0; /* TODO: remote candidates */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* verbosely log about a handover candidate */</span><br><span> static inline void debug_candidate(struct ho_candidate *candidate,</span><br><span> int8_t rxlev, int tchf_count, int tchh_count)</span><br><span>@@ -1003,8 +1013,7 @@</span><br><span> LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n",</span><br><span> rxlev2dbm(best_cand->avg),</span><br><span> best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- return trigger_handover_or_assignment(lchan, best_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand->requirements & REQUIREMENT_B_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK);</span><br><span> }</span><br><span> </span><br><span> /* select best candidate that fulfills requirement C: less or equal congestion after HO */</span><br><span>@@ -1032,8 +1041,7 @@</span><br><span> LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate, RX level %d%s\n",</span><br><span> rxlev2dbm(best_cand->avg),</span><br><span> best_applied_afs_bias? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- return trigger_handover_or_assignment(lchan, best_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand->requirements & REQUIREMENT_C_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_C_MASK);</span><br><span> }</span><br><span> </span><br><span> /* we are done in case the MS RXLEV/RXQUAL/TA aren't critical and we're avoiding congestion. */</span><br><span>@@ -1069,8 +1077,7 @@</span><br><span> LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n",</span><br><span> rxlev2dbm(best_cand->avg),</span><br><span> best_applied_afs_bias ? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- return trigger_handover_or_assignment(lchan, best_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand->requirements & REQUIREMENT_A_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_A_MASK);</span><br><span> }</span><br><span> </span><br><span> /* Damn, all is congested, has too low RXLEV or cannot service the voice call due to codec</span><br><span>@@ -1416,8 +1423,7 @@</span><br><span> LOGPHOCAND(best_cand, LOGL_DEBUG, "Best candidate: RX level %d%s\n",</span><br><span> rxlev2dbm(best_cand->avg),</span><br><span> is_improved ? " (applied AHS->AFS bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- trigger_handover_or_assignment(best_cand->lchan, best_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand->requirements & REQUIREMENT_B_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_B_MASK);</span><br><span> #if 0</span><br><span> /* if there is still congestion, mark lchan as deleted</span><br><span> * and redo this process */</span><br><span>@@ -1485,9 +1491,7 @@</span><br><span> LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n",</span><br><span> rxlev2dbm(worst_cand->avg),</span><br><span> is_improved ? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- trigger_handover_or_assignment(worst_cand->lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- worst_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- worst_cand->requirements & REQUIREMENT_B_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ trigger_ho(worst_cand, worst_cand->requirements & REQUIREMENT_B_MASK);</span><br><span> #if 0</span><br><span> /* if there is still congestion, mark lchan as deleted</span><br><span> * and redo this process */</span><br><span>@@ -1556,8 +1560,7 @@</span><br><span> LOGPHOCAND(best_cand, LOGL_INFO, "Best candidate: RX level %d%s\n",</span><br><span> rxlev2dbm(best_cand->avg),</span><br><span> is_improved ? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- trigger_handover_or_assignment(best_cand->lchan, best_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand->requirements & REQUIREMENT_C_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ trigger_ho(best_cand, best_cand->requirements & REQUIREMENT_C_MASK);</span><br><span> #if 0</span><br><span> /* if there is still congestion, mark lchan as deleted</span><br><span> * and redo this process */</span><br><span>@@ -1630,9 +1633,7 @@</span><br><span> LOGPHOCAND(worst_cand, LOGL_INFO, "Worst candidate: RX level %d from TCH/H -> TCH/F%s\n",</span><br><span> rxlev2dbm(worst_cand->avg),</span><br><span> is_improved ? " (applied AHS -> AFS rxlev bias)" : "");</span><br><span style="color: hsl(0, 100%, 40%);">- trigger_handover_or_assignment(worst_cand->lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- worst_cand->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- worst_cand->requirements & REQUIREMENT_C_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+ trigger_ho(worst_cand, worst_cand->requirements & REQUIREMENT_C_MASK);</span><br><span> #if 0</span><br><span> /* if there is still congestion, mark lchan as deleted</span><br><span> * and redo this process */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11320">change 11320</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/11320"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5ba8b556703010c8e232b516285a837c999f87ef </div>
<div style="display:none"> Gerrit-Change-Number: 11320 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>