This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21194 ) Change subject: handover_test cosmetic: eliminate bts array and bts_num from main() ...................................................................... handover_test cosmetic: eliminate bts array and bts_num from main() This "global" array shadows the bsc_gsmnet state and is not needed. Look up the BTS in bsc_gsmnet like all of osmo-bsc does. Change-Id: Ieb27403b97124771e4d28b9c69bf7c36288f396d --- M tests/handover/handover_test.c 1 file changed, 17 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 3ceaf31..b469f03 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1443,11 +1443,16 @@ .num_cat = ARRAY_SIZE(log_categories), }; +struct gsm_bts *bts_by_num_str(const char *num_str) +{ + struct gsm_bts *bts = gsm_bts_num(bsc_gsmnet, atoi(num_str)); + OSMO_ASSERT(bts); + return bts; +} + int main(int argc, char **argv) { char **test_case; - struct gsm_bts *bts[256]; - int bts_num = 0; struct gsm_lchan *lchan[256]; int lchan_num = 0; int i; @@ -1528,32 +1533,31 @@ fprintf(stderr, "- Creating %d BTS (one TRX each, " "TS(1-4) are TCH/F, TS(5-6) are TCH/H)\n", n); for (i = 0; i < n; i++) - bts[bts_num + i] = create_bts(1, bts_default_ts); - bts_num += n; + create_bts(1, bts_default_ts); test_case += 2; } else if (!strcmp(*test_case, "as-enable")) { fprintf(stderr, "- Set assignment enable state at " "BTS %s to %s\n", test_case[1], test_case[2]); - ho_set_hodec2_as_active(bts[atoi(test_case[1])]->ho, atoi(test_case[2])); + ho_set_hodec2_as_active(bts_by_num_str(test_case[1])->ho, atoi(test_case[2])); test_case += 3; } else if (!strcmp(*test_case, "ho-enable")) { fprintf(stderr, "- Set handover enable state at " "BTS %s to %s\n", test_case[1], test_case[2]); - ho_set_ho_active(bts[atoi(test_case[1])]->ho, atoi(test_case[2])); + ho_set_ho_active(bts_by_num_str(test_case[1])->ho, atoi(test_case[2])); test_case += 3; } else if (!strcmp(*test_case, "afs-rxlev-improve")) { fprintf(stderr, "- Set afs RX level improvement at " "BTS %s to %s\n", test_case[1], test_case[2]); - ho_set_hodec2_afs_bias_rxlev(bts[atoi(test_case[1])]->ho, atoi(test_case[2])); + ho_set_hodec2_afs_bias_rxlev(bts_by_num_str(test_case[1])->ho, atoi(test_case[2])); test_case += 3; } else if (!strcmp(*test_case, "afs-rxqual-improve")) { fprintf(stderr, "- Set afs RX quality improvement at " "BTS %s to %s\n", test_case[1], test_case[2]); - ho_set_hodec2_afs_bias_rxqual(bts[atoi(test_case[1])]->ho, atoi(test_case[2])); + ho_set_hodec2_afs_bias_rxqual(bts_by_num_str(test_case[1])->ho, atoi(test_case[2])); test_case += 3; } else if (!strcmp(*test_case, "set-min-free")) { @@ -1561,30 +1565,30 @@ "slots at BTS %s to %s\n", test_case[2], test_case[1], test_case[3]); if (!strcmp(test_case[2], "TCH/F")) - ho_set_hodec2_tchf_min_slots(bts[atoi(test_case[1])]->ho, atoi(test_case[3])); + ho_set_hodec2_tchf_min_slots(bts_by_num_str(test_case[1])->ho, atoi(test_case[3])); else - ho_set_hodec2_tchh_min_slots(bts[atoi(test_case[1])]->ho, atoi(test_case[3])); + ho_set_hodec2_tchh_min_slots(bts_by_num_str(test_case[1])->ho, atoi(test_case[3])); test_case += 4; } else if (!strcmp(*test_case, "set-max-ho")) { fprintf(stderr, "- Setting maximum parallel handovers " "at BTS %s to %s\n", test_case[1], test_case[2]); - ho_set_hodec2_ho_max( bts[atoi(test_case[1])]->ho, atoi(test_case[2])); + ho_set_hodec2_ho_max( bts_by_num_str(test_case[1])->ho, atoi(test_case[2])); test_case += 3; } else if (!strcmp(*test_case, "set-max-ta")) { fprintf(stderr, "- Setting maximum timing advance " "at BTS %s to %s\n", test_case[1], test_case[2]); - ho_set_hodec2_max_distance(bts[atoi(test_case[1])]->ho, atoi(test_case[2])); + ho_set_hodec2_max_distance(bts_by_num_str(test_case[1])->ho, atoi(test_case[2])); test_case += 3; } else if (!strcmp(*test_case, "create-ms")) { fprintf(stderr, "- Creating mobile #%d at BTS %s on " "%s with %s codec\n", lchan_num, test_case[1], test_case[2], test_case[3]); - lchan[lchan_num] = create_lchan(bts[atoi(test_case[1])], + lchan[lchan_num] = create_lchan(bts_by_num_str(test_case[1]), !strcmp(test_case[2], "TCH/F"), test_case[3]); if (!lchan[lchan_num]) { printf("Failed to create lchan!\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ieb27403b97124771e4d28b9c69bf7c36288f396d Gerrit-Change-Number: 21194 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201117/036d887c/attachment.htm>