dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27090 )
Change subject: bssmap_reset: make T4 user configurable
......................................................................
bssmap_reset: make T4 user configurable
The timer (T4) that controls the re-sending of the BSSMAP RESET can not
be changed via the VTY, althrough it is defined via a tdef struct. Lets
add a description along with default values to make it configurable via
the VTY.
Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Related: SYS#5796
---
M src/osmo-bsc/bssmap_reset.c
M src/osmo-bsc/net_init.c
M tests/timer.vty
3 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c
index beb8968..4d24c01 100644
--- a/src/osmo-bsc/bssmap_reset.c
+++ b/src/osmo-bsc/bssmap_reset.c
@@ -47,7 +47,7 @@
osmo_tdef_fsm_inst_state_chg(FI, STATE, \
bssmap_reset_timeouts, \
(bsc_gsmnet)->T_defs, \
- 5)
+ -1)
struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg)
{
diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index ec2f881..adcffc7 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -27,6 +27,7 @@
#include <osmocom/bsc/neighbor_ident.h>
static struct osmo_tdef gsm_network_T_defs[] = {
+ { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" },
{ .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" },
{ .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" },
{ .T=10, .default_val=6, .desc="RR Assignment" },
diff --git a/tests/timer.vty b/tests/timer.vty
index 12c13ad..e832070 100644
--- a/tests/timer.vty
+++ b/tests/timer.vty
@@ -1,6 +1,7 @@
OsmoBSC> enable
OsmoBSC# show timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
@@ -53,6 +54,7 @@
OsmoBSC# configure terminal
OsmoBSC(config)# network
OsmoBSC(config-net)# timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Gerrit-Change-Number: 27090
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27090 )
Change subject: bssmap_reset: make T4 user configurable
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
Thank you all for reviewing this: I have pushed the same patch on 2121q4 as well, so that it can be backported.
https://gerrit.osmocom.org/c/osmo-bsc/+/27091
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Gerrit-Change-Number: 27090
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 11:33:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: iedemam, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 )
Change subject: WIP: New stats for lchan life duration.
......................................................................
Patch Set 4:
(5 comments)
File src/osmo-bsc/bts_trx_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/7ecf102a_5a8ad6b4
PS4, Line 575: vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE);
Probably more interesting to print it in VTY as seconds? Doesn't look like we can glance millisecond updates in the VTY anyway.
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/0fd3e91a_42ca9366
PS4, Line 3830: vty_out(vty, " Channel Activations : %"PRIu64" TCH", activations_tch);
I'd rather put it:
Channel Activations:
TCH (avg lifespan 3s)
SDCCH (avg lifespan 5s)
See the line formatting, and also use seconds instead of milliseconds. "Average" can probably be shortened to "avg".
File src/osmo-bsc/lchan_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/2f4a8537_0e73101b
PS4, Line 1812: long long duration_ms = gsm_lchan_active_duration_ms(lchan);
Shouldn't this be an unsigned long long everywhere? Maybe simply use time_t?
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/0722481b_de0b326b
PS4, Line 1814: if (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) {
I'd go for a switch statement here, but not critical.
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/f9e99713_697ad89f
PS4, Line 1816: rate_ctr_add(rate_ctr_group_get_ctr(bts_ctrs, BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS), duration_ms);
Does it really makes sense to use this kind of value as a rate_ctr? Just asking. It's difficult to interpet it I think.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347
Gerrit-Change-Number: 27081
Gerrit-PatchSet: 4
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 11:23:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27091 )
Change subject: bssmap_reset: make T4 user configurable
......................................................................
bssmap_reset: make T4 user configurable
The timer (T4) that controls the re-sending of the BSSMAP RESET can not
be changed via the VTY, althrough it is defined via a tdef struct. Lets
add a description along with default values to make it configurable via
the VTY.
Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Related: SYS#5796
---
M src/osmo-bsc/bssmap_reset.c
M src/osmo-bsc/net_init.c
M tests/timer.vty
3 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/27091/1
diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c
index beb8968..4d24c01 100644
--- a/src/osmo-bsc/bssmap_reset.c
+++ b/src/osmo-bsc/bssmap_reset.c
@@ -47,7 +47,7 @@
osmo_tdef_fsm_inst_state_chg(FI, STATE, \
bssmap_reset_timeouts, \
(bsc_gsmnet)->T_defs, \
- 5)
+ -1)
struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg)
{
diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index ec2f881..adcffc7 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -27,6 +27,7 @@
#include <osmocom/bsc/neighbor_ident.h>
static struct osmo_tdef gsm_network_T_defs[] = {
+ { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" },
{ .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" },
{ .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" },
{ .T=10, .default_val=6, .desc="RR Assignment" },
diff --git a/tests/timer.vty b/tests/timer.vty
index 12c13ad..e832070 100644
--- a/tests/timer.vty
+++ b/tests/timer.vty
@@ -1,6 +1,7 @@
OsmoBSC> enable
OsmoBSC# show timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
@@ -53,6 +54,7 @@
OsmoBSC# configure terminal
OsmoBSC(config)# network
OsmoBSC(config-net)# timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27091
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: 2021q4
Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Gerrit-Change-Number: 27091
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 )
Change subject: gsm_network_T_defs: add T4, so it becomes configurable
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
Patchset:
PS3:
To me this belongs to the same patch, but ok.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c
Gerrit-Change-Number: 27084
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 11:00:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment