<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21234">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hodec 2: prep: common pick_better_lchan_to_move() function<br><br>There are four places deciding which of 2 lchans to move, depending on average<br>db ratings. Upcoming patches will enrich that decision for better handling of<br>dynamic timeslots, so have one common function for these to avoid code dup.<br><br>Change-Id: I745dc95cf564dd330295cecb4d64dccebf55163f<br>---<br>M src/osmo-bsc/handover_decision_2.c<br>1 file changed, 27 insertions(+), 16 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 c818dbb..7df8bb1 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>@@ -1362,6 +1362,29 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Given two candidates, pick the one that should rather be moved during handover.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Return the better candidate in out-parameters best_cand and best_avg_db.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static void pick_better_lchan_to_move(bool want_highest_db,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ho_candidate **best_cand_p, unsigned int *best_avg_db_p,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ho_candidate *other_cand, unsigned int other_avg_db)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!*best_cand_p)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto return_other;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (want_highest_db && (*best_avg_db_p < other_avg_db))</span><br><span style="color: hsl(120, 100%, 40%);">+ goto return_other;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!want_highest_db && (*best_avg_db_p > other_avg_db))</span><br><span style="color: hsl(120, 100%, 40%);">+ goto return_other;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* keep the same candidate. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+return_other:</span><br><span style="color: hsl(120, 100%, 40%);">+ *best_cand_p = other_cand;</span><br><span style="color: hsl(120, 100%, 40%);">+ *best_avg_db_p = other_avg_db;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * Handover/assignment check after timer timeout:</span><br><span> *</span><br><span>@@ -1563,10 +1586,7 @@</span><br><span> is_improved = 0;</span><br><span> LOGPHOCAND(&clist[i], LOGL_DEBUG, "candidate %d: avg=%d best_avg_db=%d\n",</span><br><span> i, avg, best_avg_db);</span><br><span style="color: hsl(0, 100%, 40%);">- if (avg > best_avg_db) {</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand = &clist[i];</span><br><span style="color: hsl(0, 100%, 40%);">- best_avg_db = avg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ pick_better_lchan_to_move(true, &best_cand, &best_avg_db, &clist[i], avg);</span><br><span> }</span><br><span> </span><br><span> /* perform handover, if there is a candidate */</span><br><span>@@ -1636,10 +1656,7 @@</span><br><span> is_improved = 1;</span><br><span> } else</span><br><span> is_improved = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (avg < worst_avg_db) {</span><br><span style="color: hsl(0, 100%, 40%);">- worst_cand = &clist[i];</span><br><span style="color: hsl(0, 100%, 40%);">- worst_avg_db = avg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ pick_better_lchan_to_move(false, &worst_cand, &worst_avg_db, &clist[i], avg);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1712,10 +1729,7 @@</span><br><span> is_improved = 1;</span><br><span> } else</span><br><span> is_improved = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (avg > best_avg_db) {</span><br><span style="color: hsl(0, 100%, 40%);">- best_cand = &clist[i];</span><br><span style="color: hsl(0, 100%, 40%);">- best_avg_db = avg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ pick_better_lchan_to_move(true, &best_cand, &best_avg_db, &clist[i], avg);</span><br><span> }</span><br><span> </span><br><span> /* perform handover, if there is a candidate */</span><br><span>@@ -1790,10 +1804,7 @@</span><br><span> is_improved = 0;</span><br><span> LOGP(DHODEC, LOGL_DEBUG, "candidate %d: avg=%d worst_avg_db=%d\n", i, avg,</span><br><span> worst_avg_db);</span><br><span style="color: hsl(0, 100%, 40%);">- if (avg < worst_avg_db) {</span><br><span style="color: hsl(0, 100%, 40%);">- worst_cand = &clist[i];</span><br><span style="color: hsl(0, 100%, 40%);">- worst_avg_db = avg;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ pick_better_lchan_to_move(false, &worst_cand, &worst_avg_db, &clist[i], avg);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21234">change 21234</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/+/21234"/><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: I745dc95cf564dd330295cecb4d64dccebf55163f </div>
<div style="display:none"> Gerrit-Change-Number: 21234 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>