<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21236">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hodec 2: prefer moving TCH/H from half-used dyn TS<br><br>Change-Id: I427dc9faa3790c24119127ae227d8cc802dd50e6<br>---<br>M src/osmo-bsc/handover_decision_2.c<br>M tests/handover/handover_test.c<br>2 files changed, 23 insertions(+), 6 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 4e54368..9fab1fc 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>@@ -1368,6 +1368,17 @@</span><br><span> || lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned int ts_usage_count(struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_for_each_lchan(lchan, ts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_state_is(lchan, LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(120, 100%, 40%);">+ count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return count;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Given two candidates, pick the one that should rather be moved during handover.</span><br><span> * Return the better candidate in out-parameters best_cand and best_avg_db.</span><br><span> */</span><br><span>@@ -1384,10 +1395,17 @@</span><br><span> goto return_other;</span><br><span> </span><br><span> /* The two lchans have identical ratings, prefer picking a dynamic timeslot: free PDCH and allow more timeslot</span><br><span style="color: hsl(0, 100%, 40%);">- * type flexibility for further congestion resolution. If both are dynamic, it does not matter which one is</span><br><span style="color: hsl(0, 100%, 40%);">- * picked. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_is_on_dynamic_ts(other_cand->lchan))</span><br><span style="color: hsl(120, 100%, 40%);">+ * type flexibility for further congestion resolution. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_is_on_dynamic_ts(other_cand->lchan)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If both are dynamic, prefer one that completely (or to a higher degree) frees its timeslot. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_is_on_dynamic_ts((*best_cand_p)->lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ && ts_usage_count((*best_cand_p)->lchan->ts) < ts_usage_count(other_cand->lchan->ts))</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If both equally satisfy these preferences, it does not matter which one is picked.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Give slight preference to moving later dyn TS, so that a free dyn TS may group with following static</span><br><span style="color: hsl(120, 100%, 40%);">+ * PDCH, though this depends on how the user configured the TS -- not harmful to do so anyway. */</span><br><span> goto return_other;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* keep the same candidate. */</span><br><span> return;</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 62c01f0..28d87db 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1765,10 +1765,9 @@</span><br><span> "congestion-check",</span><br><span> "expect-chan", "0", "1",</span><br><span> "ack-chan",</span><br><span style="color: hsl(0, 100%, 40%);">- /* Not so good: should move the half-used TCH/H instead of "halving" another dyn TS */</span><br><span style="color: hsl(0, 100%, 40%);">- "expect-ho", "0", "4",</span><br><span style="color: hsl(120, 100%, 40%);">+ "expect-ho", "0", "3",</span><br><span> "ho-complete",</span><br><span style="color: hsl(0, 100%, 40%);">- "expect-ts-use", "0", "0", "*", "TCH/F", "TCH/HH", "TCH/H-", "TCH/H-", "PDCH", "-", "-",</span><br><span style="color: hsl(120, 100%, 40%);">+ "expect-ts-use", "0", "0", "*", "TCH/F", "TCH/HH", "PDCH", "TCH/HH", "PDCH", "-", "-",</span><br><span> NULL</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/+/21236">change 21236</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/+/21236"/><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: I427dc9faa3790c24119127ae227d8cc802dd50e6 </div>
<div style="display:none"> Gerrit-Change-Number: 21236 </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>