June 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: tests/handover_cfg.vty: use more precise regex for forbidden lines

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28411 ) Change subject: tests/handover_cfg.vty: use more precise regex for forbidden lines ...................................................................... tests/handover_cfg.vty: use more precise regex for forbidden lines Current regex 'handover' is way too restrictive because it completely forbids the use of word 'handover'. Adding new VTY commands with this word in the syntax makes this VTY test fail. Use regex '^\s+handover', which only matches lines starting with some whitespace and the word 'handover'. Lines simply containing the word 'handover' will be ignored. Change-Id: I8a1550c6c97437832e05b6b4bebbcc33c2fa3d46 Related: SYS#5460 --- M tests/handover_cfg.vty 1 file changed, 29 insertions(+), 29 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_cfg.vty b/tests/handover_cfg.vty index fb3c73c..0f10133 100644 --- a/tests/handover_cfg.vty +++ b/tests/handover_cfg.vty @@ -6,7 +6,7 @@ OsmoBSC# ### No handover config present OsmoBSC# show running-config -... !handover +... !^\s+handover OsmoBSC# ### Toggling handover on network level affects 'show network': OsmoBSC# configure terminal @@ -44,17 +44,17 @@ OsmoBSC(config-net)# show running-config ... network -... !handover +... !^\s+handover handover 1 -... !handover +... !^\s+handover bts 0 -... !handover +... !^\s+handover handover 0 -... !handover +... !^\s+handover bts 1 -... !handover +... !^\s+handover handover1 power budget interval 23 -... !handover +... !^\s+handover OsmoBSC(config-net)# ### Set global default to 'off', now bts 1 also uses the global default of 'off': OsmoBSC(config-net)# handover 0 @@ -65,17 +65,17 @@ OsmoBSC(config-net)# show running-config ... network -... !handover +... !^\s+handover handover 0 -... !handover +... !^\s+handover bts 0 -... !handover +... !^\s+handover handover 0 -... !handover +... !^\s+handover bts 1 -... !handover +... !^\s+handover handover1 power budget interval 23 -... !handover +... !^\s+handover OsmoBSC(config-net)# ### Remove the global setting, i.e. use the factory default net level, with same effect: OsmoBSC(config-net)# handover default @@ -89,15 +89,15 @@ OsmoBSC(config-net)# show running-config ... network -... !handover +... !^\s+handover bts 0 -... !handover +... !^\s+handover handover 0 -... !handover +... !^\s+handover bts 1 -... !handover +... !^\s+handover handover1 power budget interval 23 -... !handover +... !^\s+handover OsmoBSC(config-net)# ### Re-enable net-level handover, but bts 0 remains disabled explicitly OsmoBSC(config-net)# handover 1 @@ -108,17 +108,17 @@ OsmoBSC(config-net)# show running-config ... network -... !handover +... !^\s+handover handover 1 -... !handover +... !^\s+handover bts 0 -... !handover +... !^\s+handover handover 0 -... !handover +... !^\s+handover bts 1 -... !handover +... !^\s+handover handover1 power budget interval 23 -... !handover +... !^\s+handover OsmoBSC(config-net)# ### Remove explicit setting of bts 0 to also use the global setting: OsmoBSC(config-net)# bts 0 @@ -133,15 +133,15 @@ OsmoBSC(config-net-bts)# show running-config ... network -... !handover +... !^\s+handover handover 1 -... !handover +... !^\s+handover bts 0 -... !handover +... !^\s+handover bts 1 -... !handover +... !^\s+handover handover1 power budget interval 23 -... !handover +... !^\s+handover OsmoBSC(config-net-bts)# ### Verify that 'min rxlev' value range stops at -50 OsmoBSC(config-net-bts)# handover2 min rxlev ? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8a1550c6c97437832e05b6b4bebbcc33c2fa3d46 Gerrit-Change-Number: 28411 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: bts_chan_load(): also calculate per-TRX channel load

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28325 ) Change subject: bts_chan_load(): also calculate per-TRX channel load ...................................................................... bts_chan_load(): also calculate per-TRX channel load This is required for the upcoming dynamic channel allocation mode. Change-Id: I220145238c23135f7e68ca2d474764312ffb66c5 Related: SYS#5460 --- M include/osmocom/bsc/bts_trx.h M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/chan_alloc.c 3 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index eab5fec..8d2493f 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -81,6 +81,7 @@ struct gsm_bts_trx_ts ts[TRX_NR_TS]; struct chan_counts chan_counts; + struct load_counter lchan_load; }; static inline struct gsm_bts_trx *gsm_bts_bb_trx_get_trx(struct gsm_bts_bb_trx *bb_transc) { diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index 9cf128e..bd13a05 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -747,6 +747,11 @@ vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE); e1isl_dump_vty(vty, trx->rsl_link_primary); } + + const struct load_counter *ll = &trx->lchan_load; + vty_out(vty, " Channel load: %u%%%s", + ll->total ? ll->used * 100 / ll->total : 0, + VTY_NEWLINE); } void config_write_e1_link(struct vty *vty, struct gsm_e1_subslot *e1_link, diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index fea4efd..4fbf8be 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -44,8 +44,12 @@ struct gsm_bts_trx *trx; llist_for_each_entry(trx, &bts->trx_list, list) { + struct load_counter *ll = &trx->lchan_load; int i; + /* init per-TRX load counters */ + memset(ll, 0, sizeof(*ll)); + /* skip administratively deactivated transceivers */ if (!trx_is_usable(trx)) continue; @@ -66,6 +70,7 @@ ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH) && (ts->pchan_is == GSM_PCHAN_NONE || ts->pchan_is == GSM_PCHAN_PDCH)) { + ll->total++; pl->total++; /* Below loop would not count this timeslot, since in PDCH mode it has no usable * timeslots. But let's make it clear that the timeslot must not be counted again: */ @@ -77,11 +82,13 @@ if (lchan->type == GSM_LCHAN_CBCH) continue; + ll->total++; pl->total++; /* lchans under a BORKEN TS should be counted * as used just as BORKEN lchans under a normal TS */ if (ts->fi->state == TS_ST_BORKEN) { + ll->used++; pl->used++; continue; } @@ -90,6 +97,7 @@ case LCHAN_ST_UNUSED: break; default: + ll->used++; pl->used++; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I220145238c23135f7e68ca2d474764312ffb66c5 Gerrit-Change-Number: 28325 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: bts_chan_load(): also calculate per-TRX channel load

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28325 ) Change subject: bts_chan_load(): also calculate per-TRX channel load ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I220145238c23135f7e68ca2d474764312ffb66c5 Gerrit-Change-Number: 28325 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:46:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: doc/manuals: document channel allocation parameters

by pespin

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28412 ) Change subject: doc/manuals: document channel allocation parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib77eb3d4ad896f1e37b52e549ca3c24f4980240b Gerrit-Change-Number: 28412 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:41:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: tests/handover_cfg.vty: use more precise regex for forbidden lines

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28411 ) Change subject: tests/handover_cfg.vty: use more precise regex for forbidden lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8a1550c6c97437832e05b6b4bebbcc33c2fa3d46 Gerrit-Change-Number: 28411 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:39:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: lchan_select: implement dynamic selection mode for assignment

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28328 ) Change subject: lchan_select: implement dynamic selection mode for assignment ...................................................................... Patch Set 3: (3 comments) Patchset: PS2: > commit log definitely needs expansion; manual probably too? Done. File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/a7484af6_cbe54d6a PS2, Line 229: /* Sort by TRX power is descending order (if needed) */ > "in descending"? Done https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/2d671084_4c17aeaf PS2, Line 231: qsort(&trx_list[0], bts->num_trx, sizeof(trx), &qsort_func); > I'm also not liking the fact that you seem to be basically mixing logic for different alloc algorith […] I though about having a separate function for dynamic mode, but then it would be 80% identical to this function... Let's see what the others think. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b7a0d706976b73cc5c30a8714b830811addfe8d Gerrit-Change-Number: 28328 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:20:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: lchan_select: allow different alloc order for assignment and handover

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28327 ) Change subject: lchan_select: allow different alloc order for assignment and handover ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > documentation/manual update seems missing Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae73b36ee9433cc768376b56f0765e5f416162f Gerrit-Change-Number: 28327 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:16:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: lchan_select: allow different alloc order for assignment and handover

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28327 ) Change subject: lchan_select: allow different alloc order for assignment and handover ...................................................................... Patch Set 2: (2 comments) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28327/comment/a8d78562_ddf0d96f PS1, Line 541: DEFUN_ATTR(cfg_bts_challoc_mode_all, > iiuc this should be marked as DEPRECATED in favor of "mode set-all" It was already marked as CMD_ATTR_HIDDEN. Changed to CMD_ATTR_DEPRECATED. File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28327/comment/d398378f_c27a3a38 PS1, Line 254: chan_alloc_reverse = bts->chan_alloc_chan_req_reverse; > you could put these in an array chan_alloc_mode[] since you already have an enum. […] I'll keep this as is for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae73b36ee9433cc768376b56f0765e5f416162f Gerrit-Change-Number: 28327 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:15:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: .gitignore: add configure~

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28410 ) Change subject: .gitignore: add configure~ ...................................................................... .gitignore: add configure~ Change-Id: I2b4327fd78914b63040fb3e7d5e00b92bdb5e1c1 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index d2b3af9..893b3d2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ install-sh missing stamp-h1 +configure~ # libtool ltmain.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I2b4327fd78914b63040fb3e7d5e00b92bdb5e1c1 Gerrit-Change-Number: 28410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: .gitignore: add configure~

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28410 ) Change subject: .gitignore: add configure~ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I2b4327fd78914b63040fb3e7d5e00b92bdb5e1c1 Gerrit-Change-Number: 28410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Jun 2022 13:10:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022