<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11319">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: drop redundant debug_candidate() args<br><br>No functional change.<br><br>Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626<br>---<br>M src/osmo-bsc/handover_decision_2.c<br>1 file changed, 14 insertions(+), 12 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 67ba26d..64fc2dd 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>@@ -700,9 +700,11 @@</span><br><span> }</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 gsm_lchan *lchan, struct ho_candidate *candidate,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *neighbor, int8_t rxlev, 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 style="color: hsl(120, 100%, 40%);">+ int8_t rxlev, int tchf_count, int tchh_count)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = candidate->lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define HO_CANDIDATE_FMT(tchx, TCHX) "TCH/" #TCHX "={free %d (want %d), [%s%s%s]%s}"</span><br><span> #define HO_CANDIDATE_ARGS(tchx, TCHX) \</span><br><span> tch##tchx##_count, ho_get_hodec2_tch##tchx##_min_slots(candidate->bts->ho), \</span><br><span>@@ -718,18 +720,18 @@</span><br><span> /* now has to be candidate->requirements & REQUIREMENT_C_TCHX != 0: */ \</span><br><span> " less-or-equal congestion"))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (neighbor)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPHOLCHANTOBTS(lchan, neighbor, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "RX level %d -> %d; "</span><br><span style="color: hsl(0, 100%, 40%);">- HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev2dbm(rxlev), rxlev2dbm(candidate->avg),</span><br><span style="color: hsl(0, 100%, 40%);">- HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H));</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPHOLCHANTOBTS(lchan, lchan->ts->trx->bts, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (candidate->bts == lchan->ts->trx->bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG,</span><br><span> "RX level %d; "</span><br><span> HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n",</span><br><span> rxlev2dbm(candidate->avg),</span><br><span> HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H));</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (candidate->bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "RX level %d -> %d; "</span><br><span style="color: hsl(120, 100%, 40%);">+ HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev2dbm(rxlev), rxlev2dbm(candidate->avg),</span><br><span style="color: hsl(120, 100%, 40%);">+ HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H));</span><br><span> }</span><br><span> </span><br><span> /* add candidate for re-assignment within the current cell */</span><br><span>@@ -748,7 +750,7 @@</span><br><span> c->bts = bts;</span><br><span> c->requirements = check_requirements(lchan, bts, tchf_count, tchh_count);</span><br><span> c->avg = av_rxlev;</span><br><span style="color: hsl(0, 100%, 40%);">- debug_candidate(lchan, c, NULL, 0, tchf_count, tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ debug_candidate(c, 0, tchf_count, tchh_count);</span><br><span> (*candidates)++;</span><br><span> }</span><br><span> </span><br><span>@@ -844,7 +846,7 @@</span><br><span> tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H);</span><br><span> c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- debug_candidate(lchan, &c, neighbor_bts, av_rxlev, tchf_count, tchh_count);</span><br><span style="color: hsl(120, 100%, 40%);">+ debug_candidate(&c, av_rxlev, tchf_count, tchh_count);</span><br><span> </span><br><span> clist[*candidates] = c;</span><br><span> (*candidates)++;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11319">change 11319</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/11319"/><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: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 </div>
<div style="display:none"> Gerrit-Change-Number: 11319 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>