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

Change in osmo-msc[master]: smpp: Parse and use SMPP-provided validity period

by laforge

Attention is currently required from: keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28136 ) Change subject: smpp: Parse and use SMPP-provided validity period ...................................................................... Patch Set 6: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad9f2697f045ed3bc0eb74c3a9730861f82e6c48 Gerrit-Change-Number: 28136 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Thu, 19 May 2022 19:34:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms_queue: Make deletion of messages from DB VTY-configurable

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28135 ) Change subject: sms_queue: Make deletion of messages from DB VTY-configurable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id6174875d5c01c40d987077651b27ae1acbcaa93 Gerrit-Change-Number: 28135 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:34:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Give smsc its own VTY config node

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28133 ) Change subject: sms: Give smsc its own VTY config node ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie8e0ab1a9f979337ff06544b9ab3820954d9804a Gerrit-Change-Number: 28133 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:34:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): work-around BER ~50% in AFS_SID_UPDATE_CN

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27942 ) Change subject: osmo-bts-trx: rx_tchh_fn(): work-around BER ~50% in AFS_SID_UPDATE_CN ...................................................................... Abandoned Proper fix in I8686d895e96fa0e606c1898b6574cc80a8f46983. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I97bb7a23aaabf48e22e1449978aa6518a41a3c98 Gerrit-Change-Number: 27942 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28166 ) Change subject: coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%) ...................................................................... coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%) As was demonstrated in [1], there is a TCH/AHS specific problem in libosmocoding causing unexpected BER ~50% in decoded AHS_SID_UPDATE frames. The reason is that A[H]S_SID_UPDATE employs quite tricky interleaving algorithm, which is different from the algorithm used by normal TCH/AHS speech frames or A[F]S_SID_UPDATE frames. +---------+--------------------+---------+--------------------+ | in-band | SID marker | in-band | coded data | +---------+--------------------+---------+--------------------+ | 16 bits | 212 bits | 16 bits | 212 bits | * AHS_SID_UPDATE is interleaved over 456 bits (4 Normal Bursts): ** both halves (228 bits each) contain coded in-band data (16 bits), ** the first half contains the identification marker (212 bits), ** the second half contains the encoded SID_UPDATE (212 bits). The first half (containing the SID marker) is carried by even bits of the first two bursts and odd bits of the last two bursts. The marker allows us to detect that it's an AHS_SID_UPDATE. The other half is carried by even bits of the last two bursts and odd bits of the first two bursts. However, the current code does not use odd bits of the first two bursts at all, so buffer cB[] in gsm0503_tch_ahs_decode_dtx() contains only 114 out of 228 bits. This patch changes the logic, so that gsm0503_tch_ahs_decode_dtx() would not split AHS_SID_UPDATE onto two frames anymore like its TCH/AFS equivalent does, but attempt to deinterleave the second half and attempt to decode the payload immediately. Change-Id: I8686d895e96fa0e606c1898b6574cc80a8f46983 Related: [1] I434157e2091a306c039123cea08d84bd8533c937 Related: SYS#5853 --- M src/coding/gsm0503_coding.c M tests/dtx/dtx_gsm0503_test.ok 2 files changed, 17 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/28166/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index e81bf02..26ca6c4 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2676,20 +2676,24 @@ /* Determine the DTX frame type (SID_UPDATE, ONSET etc...) */ if (dtx) { - const enum gsm0503_amr_dtx_frames dtx_prev = *dtx; - osmo_sbit2ubit(cBd, cB, 456); *dtx = gsm0503_detect_ahs_dtx_frame(n_errors, n_bits_total, cBd); + /* TODO: detect and handle AHS_SID_UPDATE + AHS_SID_UPDATE_INH */ switch (*dtx) { - case AMR_OTHER: - /* NOTE: The AHS_SID_UPDATE frame is splitted into - * two half rate frames. If the id marker frame - * (AHS_SID_UPDATE) is detected the following frame - * contains the actual comfort noised data part of - * (AHS_SID_UPDATE_CN). */ - if (dtx_prev != AHS_SID_UPDATE) - break; + case AHS_SID_UPDATE: + /* cB[] contains 16 bits of coded in-band data and 212 bits containing + * the identification marker. We need to unmap/deinterleave 114 odd + * bits from the last two blocks, 114 even bits from the first two + * blocks and combine them together. */ + gsm0503_tch_burst_unmap(&iB[0 * 114], &bursts[2 * 116], NULL, 0); + gsm0503_tch_burst_unmap(&iB[1 * 114], &bursts[3 * 116], NULL, 0); + gsm0503_tch_burst_unmap(&iB[2 * 114], &bursts[0 * 116], NULL, 1); + gsm0503_tch_burst_unmap(&iB[3 * 114], &bursts[1 * 116], NULL, 1); + gsm0503_tch_hr_deinterleave(cB, iB); + + /* cB[] is expected to contain 16 bits of coded in-band data and + * 212 bits containing the coded data (53 bits coded at 1/4 rate). */ *dtx = AHS_SID_UPDATE_CN; osmo_conv_decode_ber(&gsm0503_tch_axs_sid_update, @@ -2715,7 +2719,6 @@ tch_amr_reassemble(tch_data, sid_first_dummy, 39); len = 5; goto out; - case AHS_SID_UPDATE: case AHS_ONSET: case AHS_SID_FIRST_INH: case AHS_SID_UPDATE_INH: diff --git a/tests/dtx/dtx_gsm0503_test.ok b/tests/dtx/dtx_gsm0503_test.ok index 750b440..edf74ec 100644 --- a/tests/dtx/dtx_gsm0503_test.ok +++ b/tests/dtx/dtx_gsm0503_test.ok @@ -17,10 +17,10 @@ Running test_gsm0503_tch_afhs_decode_dtx(at offset=0): testing detection/decoding of AHS_SID_UPDATE ==> gsm0503_tch_ahs_decode_dtx() yields 'AMR_OTHER (audio)' (rc=-1, BER 109/212) Running test_gsm0503_tch_afhs_decode_dtx(at offset=232): testing detection/decoding of AHS_SID_UPDATE - ==> gsm0503_tch_ahs_decode_dtx() yields 'AHS_SID_UPDATE (marker)' (rc=0, BER 0/212) -Running test_gsm0503_tch_afhs_decode_dtx(at offset=464): testing detection/decoding of AHS_SID_UPDATE - ==> gsm0503_tch_ahs_decode_dtx() yields 'AHS_SID_UPDATE_CN (audio)' (rc=5, BER 106/212) + ==> gsm0503_tch_ahs_decode_dtx() yields 'AHS_SID_UPDATE_CN (audio)' (rc=5, BER 0/212) ====> tch_data[] = { 6003ccb270 } +Running test_gsm0503_tch_afhs_decode_dtx(at offset=464): testing detection/decoding of AHS_SID_UPDATE + ==> gsm0503_tch_ahs_decode_dtx() yields 'AMR_OTHER (audio)' (rc=-1, BER 111/212) Running test_gsm0503_tch_afhs_decode_dtx(at offset=0): testing tagging of FACCH/F ==> gsm0503_tch_afs_decode_dtx() yields 'AMR_OTHER (audio)' (rc=-1, BER 456/456) Running test_gsm0503_tch_afhs_decode_dtx(at offset=0): testing tagging of FACCH/H -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8686d895e96fa0e606c1898b6574cc80a8f46983 Gerrit-Change-Number: 28166 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: tests/dtx: test detection/decoding of A[FH]S_SID_UPDATE

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/28146 to look at the new patch set (#2). Change subject: tests/dtx: test detection/decoding of A[FH]S_SID_UPDATE ...................................................................... tests/dtx: test detection/decoding of A[FH]S_SID_UPDATE This patch extends the existing unit test coverage for AMR's special DTX frames. The new tests confirm that the problem with unexpected BER in decoded AFS_SID_UPDATE frames has been actually fixed [1]. Additionally this patch demonstrates another TCH/AHS specific problem, which negatively affects RxQual-SUB measurements in osmo-bts-trx: the actual content of AHS_SID_UPDATE_CN is decoded with ~50% BER, because the burst buffer contains only half of the burst bits. Change-Id: I434157e2091a306c039123cea08d84bd8533c937 Related: [1] I813081a4c0865958eee2496fe251ae17235ac842 Related: SYS#5853 --- M tests/dtx/dtx_gsm0503_test.c M tests/dtx/dtx_gsm0503_test.ok 2 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/28146/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I434157e2091a306c039123cea08d84bd8533c937 Gerrit-Change-Number: 28146 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: tests/dtx: test tagging of FACCH/[FH] frames

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/28147 to look at the new patch set (#2). Change subject: tests/dtx: test tagging of FACCH/[FH] frames ...................................................................... tests/dtx: test tagging of FACCH/[FH] frames This patch adds a new test confirming that [1] actually fixes the bug. Change-Id: I3d295a15d4446b3e440fbf4c90a1688d6c7275ae Related: [1] I2e6f4b748c6445725211e264ab5f3f5a2712087a Related: SYS#5853 --- M tests/dtx/dtx_gsm0503_test.c M tests/dtx/dtx_gsm0503_test.ok 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/28147/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3d295a15d4446b3e440fbf4c90a1688d6c7275ae Gerrit-Change-Number: 28147 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by iedemam

Attention is currently required from: neels, pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 1: (1 comment) This change is ready for review. Patchset: PS1: Hi all, Here is my Mark II of the original CPU-hungry version (https://gerrit.osmocom.org/c/osmo-bsc/+/27081). The changes being: - measure milliseconds, not deciseconds - store state every second, not every 100ms - use one timer per BSC, not one timer per lchan I originally proposed using one timer per BTS. However, after looking at the weight of the calculation, it seems to be lighter than other BSC-wide calculations, specifically: bts_update_t3122_chan_load(). I've tried to make this summation + storage operation as lightweight as possible. I'm still open to one timer per BTS but this structure matches other similar operations such as storing uptime and updating t3122. Testing has shown this to behave functionally identical to the previous version. There is some accuracy lost when an lchan is closed and the remainder of unrecorded time is discarded. Some improvements are possible for sure but this seems like roughly the way to go. Feedback very welcome. Thanks as always for your time, -Michael -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 18:13:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by iedemam

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... stats: new trackers for lchan life duration (v2) This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 8 files changed, 140 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/28165/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 58ea39c..5a67791 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -60,6 +60,8 @@ BTS_CTR_CHAN_ACT_SDCCH, BTS_CTR_CHAN_ACT_TCH, BTS_CTR_CHAN_ACT_NACK, + BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL, + BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL, BTS_CTR_RSL_UNKNOWN, BTS_CTR_RSL_IPA_NACK, BTS_CTR_RSL_DELETE_IND, @@ -757,6 +759,9 @@ unsigned long long bts_uptime(const struct gsm_bts *bts); +#define BTS_STORE_LCHAN_DURATIONS_INTERVAL 1 /* in seconds */ +void bts_store_lchan_durations(struct gsm_bts *bts); + char *get_model_oml_status(const struct gsm_bts *bts); /* reset the state of all MO in the BTS */ void gsm_bts_mo_reset(struct gsm_bts *bts); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6df7c61..6abe943 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -889,6 +889,9 @@ uint8_t interf_band; /* MS power control state */ struct lchan_power_ctrl_state ms_power_ctrl; + /* Timestamps and markers to track active state duration. */ + struct timespec active_start; + struct timespec active_stored; }; /* One Timeslot in a TRX */ @@ -1147,6 +1150,7 @@ char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); void lchan_update_name(struct gsm_lchan *lchan); +uint64_t gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) { @@ -1278,6 +1282,9 @@ /* Timer to write each BTS's uptime counter state to the stats system. */ struct osmo_timer_list bts_store_uptime_timer; + /* Timer to write each BTS's set of lchan duration counters' state to the stats system. */ + struct osmo_timer_list bts_store_lchan_durations_timer; + struct { /* Single MGCP client configuration under msc node (also required for * MGCP proxy when sccp-lite is used) */ diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 0412f6b..650a76b 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -88,6 +88,18 @@ osmo_timer_schedule(&net->bts_store_uptime_timer, BTS_STORE_UPTIME_INTERVAL, 0); } +static void bsc_store_bts_lchan_durations(void *data) +{ + struct gsm_network *net = data; + struct gsm_bts *bts; + + llist_for_each_entry(bts, &net->bts_list, list) + bts_store_lchan_durations(bts); + + /* Keep this timer ticking. */ + osmo_timer_schedule(&net->bts_store_lchan_durations_timer, BTS_STORE_LCHAN_DURATIONS_INTERVAL, 0); +} + static struct gsm_network *bsc_network_init(void *ctx) { struct gsm_network *net = gsm_network_init(ctx); @@ -180,6 +192,10 @@ osmo_timer_setup(&net->bts_store_uptime_timer, bsc_store_bts_uptime, net); osmo_timer_schedule(&net->bts_store_uptime_timer, BTS_STORE_UPTIME_INTERVAL, 0); + /* Init lchan duration tracking timer. */ + osmo_timer_setup(&net->bts_store_lchan_durations_timer, bsc_store_bts_lchan_durations, net); + osmo_timer_schedule(&net->bts_store_lchan_durations_timer, BTS_STORE_LCHAN_DURATIONS_INTERVAL, 0); + net->cbc->net = net; net->cbc->mode = BSC_CBC_LINK_MODE_DISABLED; net->cbc->server.local_addr = bsc_cbc_default_server_local_addr; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c04a59e..ce33482 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -741,6 +741,61 @@ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_UPTIME_SECONDS), bts_uptime(bts)); } +void bts_store_lchan_durations(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + int i, j; + struct timespec now, elapsed; + uint64_t elapsed_ms; + uint64_t elapsed_tch_ms = 0; + uint64_t elapsed_sdcch_ms = 0; + + /* Ignore BTS that are not in operation. */ + if (!trx_is_usable(bts->c0)) + return; + + /* Grab storage time to be used for all lchans. */ + osmo_clock_gettime(CLOCK_MONOTONIC, &now); + + /* Iterate over all lchans. */ + llist_for_each_entry(trx, &bts->trx_list, list) { + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + for (j = 0; j < ARRAY_SIZE(ts->lchan); j++) { + struct gsm_lchan *lchan = &ts->lchan[j]; + + /* Ignore inactive lchans. */ + if (!lchan->activate.concluded) + continue; + + /* Calculate elapsed time since last storage. */ + timespecsub(&now, &lchan->active_stored, &elapsed); + elapsed_ms = elapsed.tv_sec * 1000 + elapsed.tv_nsec / 1000000; + + /* Assign elapsed time to appropriate bucket. */ + switch (lchan->type) { + case GSM_LCHAN_TCH_H: + case GSM_LCHAN_TCH_F: + elapsed_tch_ms += elapsed_ms; + break; + case GSM_LCHAN_SDCCH: + elapsed_sdcch_ms += elapsed_ms; + break; + default: + continue; + } + + /* Update storage time. */ + lchan->active_stored = now; + } + } + } + + /* Export to rate counters. */ + rate_ctr_add(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL), elapsed_tch_ms); + rate_ctr_add(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL), elapsed_sdcch_ms); +} + unsigned long long bts_uptime(const struct gsm_bts *bts) { struct timespec tp; @@ -1099,6 +1154,12 @@ [BTS_CTR_CHAN_ACT_NACK] = \ { "chan_act:nack", "Number of Channel Activations that the BTS NACKed" }, + [BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL] = \ + { "chan_tch:active_milliseconds:total", + "Cumulative number of milliseconds of TCH channel activity" }, + [BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL] = \ + { "chan_sdcch:active_milliseconds:total", + "Cumulative number of milliseconds of SDCCH channel activity" }, [BTS_CTR_RSL_UNKNOWN] = \ { "rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS" }, diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index a3d6033..d232d46 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -569,6 +569,13 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); + + if (lchan->activate.concluded) { + vty_out(vty, " Activated %s seconds ago%s", + osmo_int_to_float_str_c(OTC_SELECT, gsm_lchan_active_duration_ms(lchan), 3), + VTY_NEWLINE); + } + vty_out_dyn_ts_details(vty, lchan->ts); vty_out(vty, " Connection: %u, State: %s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 4e60cd8..ba4215a 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -3677,6 +3677,8 @@ struct gsm_bts_trx *trx; int ts_hopping_total; int ts_non_hopping_total; + const struct rate_ctr *activations_tch; + const struct rate_ctr *activations_sdcch; vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, " "BSIC %u (NCC=%u, BCC=%u) and %u TRX%s", @@ -3851,6 +3853,29 @@ rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_TOTAL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_NO_CHANNEL)->current, VTY_NEWLINE); + + vty_out(vty, " Channel Activations :%s", VTY_NEWLINE); + activations_tch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_TCH); + vty_out(vty, " TCH %"PRIu64"", activations_tch->current); + if (activations_tch->intv[RATE_CTR_INTV_HOUR].rate > 0) { + const struct rate_ctr *active_time_tch_ms = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL); + vty_out(vty, " (avg lifespan %s seconds in last hour)", + osmo_int_to_float_str_c(OTC_SELECT, + active_time_tch_ms->intv[RATE_CTR_INTV_HOUR].rate + / activations_tch->intv[RATE_CTR_INTV_HOUR].rate, 3)); + } + vty_out(vty, "%s", VTY_NEWLINE); + activations_sdcch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_SDCCH); + vty_out(vty, " SDCCH %"PRIu64"", activations_sdcch->current); + if (activations_sdcch->intv[RATE_CTR_INTV_HOUR].rate > 0) { + const struct rate_ctr *active_time_sdcch_ms = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL); + vty_out(vty, " (avg lifespan %s seconds in last hour)", + osmo_int_to_float_str_c(OTC_SELECT, + active_time_sdcch_ms->intv[RATE_CTR_INTV_HOUR].rate + / activations_sdcch->intv[RATE_CTR_INTV_HOUR].rate, 3)); + } + vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, " Channel Failures : %"PRIu64" rf_failures, %"PRIu64" rll failures%s", rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RF_FAIL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RLL_ERR)->current, diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 22be92d..237ff4a 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -342,6 +342,21 @@ lchan->nr - (lchan->vamos.is_secondary ? ts->max_primary_lchans : 0)); } +/* If the lchan is currently active, return the duration since activation in milliseconds. + * Otherwise return 0. */ +uint64_t gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan) +{ + struct timespec now, elapsed; + + if (!lchan->activate.concluded) + return 0; + + osmo_clock_gettime(CLOCK_MONOTONIC, &now); + timespecsub(&now, &lchan->active_start, &elapsed); + + return elapsed.tv_sec * 1000 + elapsed.tv_nsec / 1000000; +} + /* obtain the MO structure for a given object instance */ static inline struct gsm_abis_mo * gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5df6c57..74a241e 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -204,6 +204,10 @@ return; lchan->activate.concluded = true; + /* Set active state timekeeping markers. */ + osmo_clock_gettime(CLOCK_MONOTONIC, &lchan->active_start); + osmo_clock_gettime(CLOCK_MONOTONIC, &lchan->active_stored); + switch (lchan->activate.info.activ_for) { case ACTIVATE_FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: common/Release.key: update

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28164 ) Change subject: common/Release.key: update ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30d51435108c4763a92d57de223503d4ca4b0969 Gerrit-Change-Number: 28164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 17:33:51 +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 May 2022