<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21194">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test cosmetic: eliminate bts array and bts_num from main()<br><br>This "global" array shadows the bsc_gsmnet state and is not needed. Look up the<br>BTS in bsc_gsmnet like all of osmo-bsc does.<br><br>Change-Id: Ieb27403b97124771e4d28b9c69bf7c36288f396d<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 17 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 3ceaf31..b469f03 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1443,11 +1443,16 @@</span><br><span> .num_cat = ARRAY_SIZE(log_categories),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_bts *bts_by_num_str(const char *num_str)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = gsm_bts_num(bsc_gsmnet, atoi(num_str));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bts;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> char **test_case;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts[256];</span><br><span style="color: hsl(0, 100%, 40%);">- int bts_num = 0;</span><br><span> struct gsm_lchan *lchan[256];</span><br><span> int lchan_num = 0;</span><br><span> int i;</span><br><span>@@ -1528,32 +1533,31 @@</span><br><span> fprintf(stderr, "- Creating %d BTS (one TRX each, "</span><br><span> "TS(1-4) are TCH/F, TS(5-6) are TCH/H)\n", n);</span><br><span> for (i = 0; i < n; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- bts[bts_num + i] = create_bts(1, bts_default_ts);</span><br><span style="color: hsl(0, 100%, 40%);">- bts_num += n;</span><br><span style="color: hsl(120, 100%, 40%);">+ create_bts(1, bts_default_ts);</span><br><span> test_case += 2;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "as-enable")) {</span><br><span> fprintf(stderr, "- Set assignment enable state at "</span><br><span> "BTS %s to %s\n", test_case[1], test_case[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_as_active(bts[atoi(test_case[1])]->ho, atoi(test_case[2]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_as_active(bts_by_num_str(test_case[1])->ho, atoi(test_case[2]));</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "ho-enable")) {</span><br><span> fprintf(stderr, "- Set handover enable state at "</span><br><span> "BTS %s to %s\n", test_case[1], test_case[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_ho_active(bts[atoi(test_case[1])]->ho, atoi(test_case[2]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_ho_active(bts_by_num_str(test_case[1])->ho, atoi(test_case[2]));</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "afs-rxlev-improve")) {</span><br><span> fprintf(stderr, "- Set afs RX level improvement at "</span><br><span> "BTS %s to %s\n", test_case[1], test_case[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_afs_bias_rxlev(bts[atoi(test_case[1])]->ho, atoi(test_case[2]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_afs_bias_rxlev(bts_by_num_str(test_case[1])->ho, atoi(test_case[2]));</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "afs-rxqual-improve")) {</span><br><span> fprintf(stderr, "- Set afs RX quality improvement at "</span><br><span> "BTS %s to %s\n", test_case[1], test_case[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_afs_bias_rxqual(bts[atoi(test_case[1])]->ho, atoi(test_case[2]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_afs_bias_rxqual(bts_by_num_str(test_case[1])->ho, atoi(test_case[2]));</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "set-min-free")) {</span><br><span>@@ -1561,30 +1565,30 @@</span><br><span> "slots at BTS %s to %s\n", test_case[2],</span><br><span> test_case[1], test_case[3]);</span><br><span> if (!strcmp(test_case[2], "TCH/F"))</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_tchf_min_slots(bts[atoi(test_case[1])]->ho, atoi(test_case[3]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_tchf_min_slots(bts_by_num_str(test_case[1])->ho, atoi(test_case[3]));</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_tchh_min_slots(bts[atoi(test_case[1])]->ho, atoi(test_case[3]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_tchh_min_slots(bts_by_num_str(test_case[1])->ho, atoi(test_case[3]));</span><br><span> test_case += 4;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "set-max-ho")) {</span><br><span> fprintf(stderr, "- Setting maximum parallel handovers "</span><br><span> "at BTS %s to %s\n", test_case[1],</span><br><span> test_case[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_ho_max( bts[atoi(test_case[1])]->ho, atoi(test_case[2]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_ho_max( bts_by_num_str(test_case[1])->ho, atoi(test_case[2]));</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "set-max-ta")) {</span><br><span> fprintf(stderr, "- Setting maximum timing advance "</span><br><span> "at BTS %s to %s\n", test_case[1],</span><br><span> test_case[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- ho_set_hodec2_max_distance(bts[atoi(test_case[1])]->ho, atoi(test_case[2]));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_hodec2_max_distance(bts_by_num_str(test_case[1])->ho, atoi(test_case[2]));</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "create-ms")) {</span><br><span> fprintf(stderr, "- Creating mobile #%d at BTS %s on "</span><br><span> "%s with %s codec\n", lchan_num, test_case[1],</span><br><span> test_case[2], test_case[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[lchan_num] = create_lchan(bts[atoi(test_case[1])],</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan[lchan_num] = create_lchan(bts_by_num_str(test_case[1]),</span><br><span> !strcmp(test_case[2], "TCH/F"), test_case[3]);</span><br><span> if (!lchan[lchan_num]) {</span><br><span> printf("Failed to create lchan!\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21194">change 21194</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/+/21194"/><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: Ieb27403b97124771e4d28b9c69bf7c36288f396d </div>
<div style="display:none"> Gerrit-Change-Number: 21194 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>