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

Change in osmo-bsc[master]: paging: Implement upper bound of 60s for dynamic T3113

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28059 ) Change subject: paging: Implement upper bound of 60s for dynamic T3113 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib8228f8485527d34794048a9927e62b6ec8d802a Gerrit-Change-Number: 28059 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 May 2022 09:10:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Avoid queueing more than 60 second estimated requests

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28062 ) Change subject: paging: Avoid queueing more than 60 second estimated requests ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6523c6816a4d16b71084d004e979be40cf0aeeb0 Gerrit-Change-Number: 28062 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 May 2022 09:03:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: measurement: move SACCH detection to process_l1sap_meas_data()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28085 ) Change subject: measurement: move SACCH detection to process_l1sap_meas_data() ...................................................................... measurement: move SACCH detection to process_l1sap_meas_data() SACCH detection can be simplified by checking the RSL Link ID in process_l1sap_meas_data(). This eliminates the need to lookup the multiframe position by calling trx_sched_is_sacch_fn(), which definitely takes more CPU time than just L1SAP_IS_LINK_SACCH(). Calling trx_sched_is_sacch_fn() is still required for BTS models reporting the measurements via PRIM_MPH_INFO (legacy way), separately from the related Uplink blocks. This patch can be summarized as follows: * detect SACCH and set .is_sub=1 in process_l1sap_meas_data(); ** for PRIM_MPH_INFO use trx_sched_is_sacch_fn(); ** for PRIM_PH_DATA use L1SAP_IS_LINK_SACCH(); * do not call trx_sched_is_sacch_fn() from ts45008_83_is_sub(); * modify the unit test - test_ts45008_83_is_sub_single(); ** remove test_ts45008_83_is_sub_is_sacch(). Change-Id: I507e96ee34ac0f8b7a2a6f16a8c7f92bc467df60 Related: SYS#5853 --- M src/common/l1sap.c M src/common/measurement.c M tests/meas/meas_test.c 3 files changed, 16 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/28085/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8e71cd4..2c5a141 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -697,6 +697,8 @@ } } +bool trx_sched_is_sacch_fn(const struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink); + /* measurement information received from bts model */ static void process_l1sap_meas_data(struct gsm_lchan *lchan, const struct osmo_phsap_prim *l1sap, @@ -722,6 +724,9 @@ .ci_cb = info_meas_ind->c_i_cb, .is_sub = info_meas_ind->is_sub, }; + /* treat SACCH frames (match by TDMA FN) as SUB frames */ + if (!ulm.is_sub && trx_sched_is_sacch_fn(lchan->ts, fn, true)) + ulm.is_sub = 1; break; case PRIM_TCH: ph_tch_ind = &l1sap->u.tch; @@ -736,6 +741,7 @@ .ci_cb = ph_tch_ind->lqual_cb, .is_sub = ph_tch_ind->is_sub, }; + /* PRIM_TCH always carries DCCH, not SACCH */ break; case PRIM_PH_DATA: ph_data_ind = &l1sap->u.data; @@ -750,6 +756,9 @@ .ci_cb = ph_data_ind->lqual_cb, .is_sub = ph_data_ind->is_sub, }; + /* treat SACCH frames (match by RSL link ID) as SUB frames */ + if (!ulm.is_sub && L1SAP_IS_LINK_SACCH(ph_data_ind->link_id)) + ulm.is_sub = 1; break; default: OSMO_ASSERT(false); diff --git a/src/common/measurement.c b/src/common/measurement.c index d1f9960..aa1f5ae 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -56,20 +56,18 @@ /* See TS 45.008 Sections 8.3 and 8.4 for a detailed descriptions of the rules * implemented here. We only implement the logic for Voice, not CSD */ + /* AMR is special, SID frames may be scheduled dynamically at any time */ + if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) + return false; + switch (lchan->type) { case GSM_LCHAN_TCH_F: switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - if (trx_sched_is_sacch_fn(lchan->ts, fn, true)) - return true; if (ARRAY_CONTAINS(ts45008_83_tch_f, fn104)) return true; break; - case GSM48_CMODE_SPEECH_AMR: - if (trx_sched_is_sacch_fn(lchan->ts, fn, true)) - return true; - break; case GSM48_CMODE_SIGN: /* No DTX allowed; SUB=FULL, therefore measurements at all frame numbers are * SUB */ @@ -83,8 +81,6 @@ case GSM_LCHAN_TCH_H: switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: - if (trx_sched_is_sacch_fn(lchan->ts, fn, true)) - return true; switch (lchan->nr) { case 0: if (ARRAY_CONTAINS(ts45008_83_tch_hs0, fn104)) @@ -98,10 +94,6 @@ OSMO_ASSERT(0); } break; - case GSM48_CMODE_SPEECH_AMR: - if (trx_sched_is_sacch_fn(lchan->ts, fn, true)) - return true; - break; case GSM48_CMODE_SIGN: /* No DTX allowed; SUB=FULL, therefore measurements at all frame numbers are * SUB */ diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 79ec358..a3c514b 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -373,28 +373,6 @@ } } -static bool test_ts45008_83_is_sub_is_sacch(uint32_t fn) -{ - if (fn % 104 == 12) - return true; - if (fn % 104 == 25) - return true; - if (fn % 104 == 38) - return true; - if (fn % 104 == 51) - return true; - if (fn % 104 == 64) - return true; - if (fn % 104 == 77) - return true; - if (fn % 104 == 90) - return true; - if (fn % 104 == 103) - return true; - - return false; -} - static bool test_ts45008_83_is_sub_is_sub(const struct gsm_lchan *lchan, uint32_t fn) { fn = fn % 104; @@ -473,16 +451,9 @@ * results (false positive and false negative) */ for (i = 0; i < 104 * 100; i++) { rc = ts45008_83_is_sub(lchan, i); - if (rc) { - if (!test_ts45008_83_is_sub_is_sacch(i) - && !test_ts45008_83_is_sub_is_sub(lchan, i)) { - printf(" ==> Unexpected SUB frame at fn=%u\n", i); - } - } else { - if (test_ts45008_83_is_sub_is_sacch(i) - && test_ts45008_83_is_sub_is_sub(lchan, i)) { - printf(" ==> Unexpected non-SUB frame at fn=%u\n", i); - } + if (rc != test_ts45008_83_is_sub_is_sub(lchan, i)) { + printf(" ==> ts45008_83_is_sub(fn=%u) yields %s, expected %s\n", + i, rc ? "true" : "false", !rc ? "true" : "false"); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I507e96ee34ac0f8b7a2a6f16a8c7f92bc467df60 Gerrit-Change-Number: 28085 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: measurement: fix matching of SUB frames by TDMA FN

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28086 ) Change subject: measurement: fix matching of SUB frames by TDMA FN ...................................................................... measurement: fix matching of SUB frames by TDMA FN 3GPP TS 45.008, section 8.3 defines active TDMA frame subsets for TCH channels, which shall always be transmitted even during the silence periods in DTX mode of operation. Each frame number listed in this section corresponds to a single burst. The Uplink measurements always contain TDMA FN of the *first* burst of a block, so it does not make sense to match the given FN against all FNs in the respective subset. Instead, we should match only specific FNs in accordance with the block mapping rules defined in 3GPP TS 45.002, section 7, table 1. In the active subset for TCH/F there is only one *complete* block starting at FN=52. Incomplete blocks {52, 53, 54, 55} and {56, 57, 58, 59} contain only 50% of the useful bits (partial SID) and thus ~50% BER, so we don't treat them as SUB. In the active subsets for TCH/H there are two *complete* blocks for each sub-slot. Their respective first FNs can be efficiently defined in a lookup table (see ts45008_dtx_tchh_fn_map[]). Note that we can use a single lookup table for both sub-slots of TCH/H because their TDMA FNs do not overlap. This patch fixes unexpected SUB-RxQual values > 0 on TCH channels with DTXu enabled and other than AMR (HR, FR, EFR) codec in use. Change-Id: I8cc3a755a8ad4dc564439aab2298c1e97ac0592d Related: SYS#5853 --- M src/common/measurement.c M tests/meas/meas_test.c 2 files changed, 32 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/28086/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index aa1f5ae..1eccfc6 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -16,10 +16,17 @@ #include <osmo-bts/power_control.h> #include <osmo-bts/ta_control.h> -/* Tables as per TS 45.008 Section 8.3 */ -static const uint8_t ts45008_83_tch_f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; -static const uint8_t ts45008_83_tch_hs0[] = { 0, 2, 4, 6, 52, 54, 56, 58 }; -static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 20, 66, 68, 70, 72 }; +/* Active TDMA frame subset for TCH/H in DTX mode (see 3GPP TS 45.008 Section 8.3). + * This mapping is used to determine if a L2 block starting at the given TDMA FN + * belongs to the SUB set and thus shall always be transmitted in DTX mode. */ +static const uint8_t ts45008_dtx_tchh_fn_map[104] = { + /* TCH/H(0): 0, 2, 4, 6, 52, 54, 56, 58 */ + [0] = 1, /* block { 0, 2, 4, 6} */ + [52] = 1, /* block {52, 54, 56, 58} */ + /* TCH/H(1): 14, 16, 18, 20, 66, 68, 70, 72 */ + [14] = 1, /* block {14, 16, 18, 20} */ + [66] = 1, /* block {66, 68, 70, 72} */ +}; /* In cases where we less measurements than we expect we must assume that we * just did not receive the block because it was lost due to bad channel @@ -36,17 +43,6 @@ .inv_rssi = MEASUREMENT_DUMMY_IRSSI }; -/* find out if an array contains a given key as element */ -#define ARRAY_CONTAINS(arr, val) array_contains(arr, ARRAY_SIZE(arr), val) -static bool array_contains(const uint8_t *arr, unsigned int len, uint8_t val) { - int i; - for (i = 0; i < len; i++) { - if (arr[i] == val) - return true; - } - return false; -} - /* Decide if a given frame number is part of the "-SUB" measurements (true) or not (false) * (this function is only used internally, it is public to call it from unit-tests) */ bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn) @@ -65,7 +61,11 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - if (ARRAY_CONTAINS(ts45008_83_tch_f, fn104)) + /* Active TDMA frame subset for TCH/F: 52, 53, 54, 55, 56, 57, 58, 59. + * There is only one *complete* block in this subset starting at FN=52. + * Incomplete blocks {52, 53, 54, 55} and {56, 57, 58, 59} contain only + * 50% of the useful bits (partial SID) and thus ~50% BER. */ + if (fn104 == 52) return true; break; case GSM48_CMODE_SIGN: @@ -81,18 +81,8 @@ case GSM_LCHAN_TCH_H: switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: - switch (lchan->nr) { - case 0: - if (ARRAY_CONTAINS(ts45008_83_tch_hs0, fn104)) - return true; - break; - case 1: - if (ARRAY_CONTAINS(ts45008_83_tch_hs1, fn104)) - return true; - break; - default: - OSMO_ASSERT(0); - } + if (ts45008_dtx_tchh_fn_map[fn104]) + return true; break; case GSM48_CMODE_SIGN: /* No DTX allowed; SUB=FULL, therefore measurements at all frame numbers are @@ -432,16 +422,16 @@ /* 1 block SACCH, 24 blocks TCH (see note 1) */ return 25; } else { - /* 1 block SACCH, 2 blocks TCH */ - return 3; + /* 1 block SACCH, 1 block TCH */ + return 2; } case GSM_PCHAN_TCH_H: if (lchan->tch_mode == GSM48_CMODE_SIGN) { /* 1 block SACCH, 12 blocks TCH (see ynote 1) */ return 13; } else { - /* 1 block SACCH, 4 blocks TCH */ - return 5; + /* 1 block SACCH, 2 blocks TCH */ + return 3; } case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index a3c514b..4b8aff8 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -379,44 +379,17 @@ switch (lchan->type) { case GSM_LCHAN_TCH_F: - return (fn >= 52 && fn <= 59); + /* block {52, 53, 54, 55, 56, 57, 58, 59} */ + return fn == 52; case GSM_LCHAN_TCH_H: - if (lchan->nr == 0) { - if (fn == 0) - return true; - if (fn == 2) - return true; - if (fn == 4) - return true; - if (fn == 6) - return true; - if (fn == 52) - return true; - if (fn == 54) - return true; - if (fn == 56) - return true; - if (fn == 58) - return true; - } else if (lchan->nr == 1) { - if (fn == 14) - return true; - if (fn == 16) - return true; - if (fn == 18) - return true; - if (fn == 20) - return true; - if (fn == 66) - return true; - if (fn == 68) - return true; - if (fn == 70) - return true; - if (fn == 72) - return true; - } else - OSMO_ASSERT(false); + if (fn == 0) /* H0 block { 0, 2, 4, 6} */ + return true; + if (fn == 52) /* H0 block {52, 54, 56, 58} */ + return true; + if (fn == 14) /* H1 block {14, 16, 18, 20} */ + return true; + if (fn == 66) /* H1 block {66, 68, 70, 72} */ + return true; return false; default: return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8cc3a755a8ad4dc564439aab2298c1e97ac0592d Gerrit-Change-Number: 28086 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: tests/meas: improve test_ts45008_83_is_sub_is_sub()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28083 ) Change subject: tests/meas: improve test_ts45008_83_is_sub_is_sub() ...................................................................... tests/meas: improve test_ts45008_83_is_sub_is_sub() This function should also take lchan type into account. Change-Id: I6920a04e0a6c846647fa1b6b3a3c80bbd6617b99 Related: SYS#5853 --- M tests/meas/meas_test.c 1 file changed, 47 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/28083/1 diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 32f0e7a..79ec358 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -395,51 +395,54 @@ return false; } -static bool test_ts45008_83_is_sub_is_sub(uint32_t fn, uint8_t ss) +static bool test_ts45008_83_is_sub_is_sub(const struct gsm_lchan *lchan, uint32_t fn) { fn = fn % 104; - if (fn >= 52 && fn <= 59) - return true; - - if (ss == 0) { - if (fn == 0) - return true; - if (fn == 2) - return true; - if (fn == 4) - return true; - if (fn == 6) - return true; - if (fn == 52) - return true; - if (fn == 54) - return true; - if (fn == 56) - return true; - if (fn == 58) - return true; - } else if (ss == 1) { - if (fn == 14) - return true; - if (fn == 16) - return true; - if (fn == 18) - return true; - if (fn == 20) - return true; - if (fn == 66) - return true; - if (fn == 68) - return true; - if (fn == 70) - return true; - if (fn == 72) - return true; - } else - OSMO_ASSERT(false); - - return false; + switch (lchan->type) { + case GSM_LCHAN_TCH_F: + return (fn >= 52 && fn <= 59); + case GSM_LCHAN_TCH_H: + if (lchan->nr == 0) { + if (fn == 0) + return true; + if (fn == 2) + return true; + if (fn == 4) + return true; + if (fn == 6) + return true; + if (fn == 52) + return true; + if (fn == 54) + return true; + if (fn == 56) + return true; + if (fn == 58) + return true; + } else if (lchan->nr == 1) { + if (fn == 14) + return true; + if (fn == 16) + return true; + if (fn == 18) + return true; + if (fn == 20) + return true; + if (fn == 66) + return true; + if (fn == 68) + return true; + if (fn == 70) + return true; + if (fn == 72) + return true; + } else + OSMO_ASSERT(false); + return false; + default: + return false; + } } static void test_ts45008_83_is_sub_single(uint8_t ts, uint8_t ss, bool fr) @@ -472,12 +475,12 @@ rc = ts45008_83_is_sub(lchan, i); if (rc) { if (!test_ts45008_83_is_sub_is_sacch(i) - && !test_ts45008_83_is_sub_is_sub(i, ss)) { + && !test_ts45008_83_is_sub_is_sub(lchan, i)) { printf(" ==> Unexpected SUB frame at fn=%u\n", i); } } else { if (test_ts45008_83_is_sub_is_sacch(i) - && test_ts45008_83_is_sub_is_sub(i, ss)) { + && test_ts45008_83_is_sub_is_sub(lchan, i)) { printf(" ==> Unexpected non-SUB frame at fn=%u\n", i); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6920a04e0a6c846647fa1b6b3a3c80bbd6617b99 Gerrit-Change-Number: 28083 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: measurement: log SUB/FULL as text in lchan_new_ul_meas()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28084 ) Change subject: measurement: log SUB/FULL as text in lchan_new_ul_meas() ...................................................................... measurement: log SUB/FULL as text in lchan_new_ul_meas() Change-Id: Idfaf8ad2ac0fd4da57a0981563e6ad6104fa4e41 Related: SYS#5853 --- M src/common/measurement.c 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/28084/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 1251b48..d1f9960 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -346,10 +346,11 @@ if (!ulm->is_sub) dest->is_sub = ts45008_83_is_sub(lchan, fn); - DEBUGPFN(DMEAS, fn, "%s adding measurement (ber10k=%u, ta_offs=%d, ci_cB=%d, is_sub=%u, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n", - gsm_lchan_name(lchan), ulm->ber10k, ulm->ta_offs_256bits, - ulm->ci_cb, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, - fn_mod); + DEBUGPFN(DMEAS, fn, "%s adding a %s measurement (ber10k=%u, ta_offs=%d, ci_cB=%d, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n", + gsm_lchan_name(lchan), + dest->is_sub ? "SUB" : "FULL", + ulm->ber10k, ulm->ta_offs_256bits, ulm->ci_cb, ulm->inv_rssi, + lchan->meas.num_ul_meas, fn_mod); lchan->meas.last_fn = fn; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfaf8ad2ac0fd4da57a0981563e6ad6104fa4e41 Gerrit-Change-Number: 28084 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: scheduler: trx_sched_is_sacch_fn(): make ts pointer const

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28080 ) Change subject: scheduler: trx_sched_is_sacch_fn(): make ts pointer const ...................................................................... scheduler: trx_sched_is_sacch_fn(): make ts pointer const Change-Id: I48a1a549d7c1553bccaa01cdc818873a4c6cdf0a --- M include/osmo-bts/scheduler.h M src/common/scheduler_mframe.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/28080/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 51b1846..ec31eab 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -231,7 +231,7 @@ int find_sched_mframe_idx(enum gsm_phys_chan_config pchan, uint8_t tn); /*! Determine if given frame number contains SACCH (true) or other (false) burst */ -bool trx_sched_is_sacch_fn(struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink); +bool trx_sched_is_sacch_fn(const struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink); extern const struct trx_sched_multiframe trx_sched_multiframes[]; #define TRX_BI_F_NOPE_IND (1 << 0) diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c index f6476ec..c9a585d 100644 --- a/src/common/scheduler_mframe.c +++ b/src/common/scheduler_mframe.c @@ -1000,7 +1000,7 @@ } /* Determine if given frame number contains SACCH (true) or other (false) burst */ -bool trx_sched_is_sacch_fn(struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink) +bool trx_sched_is_sacch_fn(const struct gsm_bts_trx_ts *ts, uint32_t fn, bool uplink) { int i; const struct trx_sched_multiframe *sched; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I48a1a549d7c1553bccaa01cdc818873a4c6cdf0a Gerrit-Change-Number: 28080 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: tests/meas: improve logging in test_ts45008_83_is_sub_single()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28082 ) Change subject: tests/meas: improve logging in test_ts45008_83_is_sub_single() ...................................................................... tests/meas: improve logging in test_ts45008_83_is_sub_single() * Print unexpected TDMA FNs, each on a separate new line. * Do not abort() on mismatch, keep running. Change-Id: I32c104b139f32a39c8347de19de6ad7caec811de Related: SYS#5853 --- M tests/meas/meas_test.c 1 file changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/28082/1 diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 9494495..32f0e7a 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -464,8 +464,7 @@ lchan->tch_mode = GSM48_CMODE_SPEECH_V1; } - printf(" TS=%u ", ts); - printf("SS=%u", ss); + printf(" TS=%u SS=%u\n", ts, ss); /* Walk trough the first 100 intervals and check for unexpected * results (false positive and false negative) */ @@ -474,19 +473,15 @@ if (rc) { if (!test_ts45008_83_is_sub_is_sacch(i) && !test_ts45008_83_is_sub_is_sub(i, ss)) { - printf("==> Unexpected SUB frame at fn=%u", i); - OSMO_ASSERT(false); + printf(" ==> Unexpected SUB frame at fn=%u\n", i); } } else { if (test_ts45008_83_is_sub_is_sacch(i) && test_ts45008_83_is_sub_is_sub(i, ss)) { - printf("==> Unexpected non-SUB frame at fn=%u", - i); - OSMO_ASSERT(false); + printf(" ==> Unexpected non-SUB frame at fn=%u\n", i); } } } - printf("\n"); } static void test_ts45008_83_is_sub(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32c104b139f32a39c8347de19de6ad7caec811de Gerrit-Change-Number: 28082 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: struct bts_ul_meas: reflect C/I units in field name s/c_i/ci_cb/

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28081 ) Change subject: struct bts_ul_meas: reflect C/I units in field name s/c_i/ci_cb/ ...................................................................... struct bts_ul_meas: reflect C/I units in field name s/c_i/ci_cb/ Change-Id: If07f7f2a3ea996cbfc6a9087fa34402e38a7fd9f Related: SYS#5853 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_testcases.h 5 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/28081/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 9cdc6f7..90c28d9 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -52,7 +52,7 @@ /* timing advance offset (in 1/256 bits) */ int16_t ta_offs_256bits; /* C/I ratio in cB */ - int16_t c_i; + int16_t ci_cb; /* flags */ uint8_t is_sub:1; /* RSSI in dBm * -1 */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 53a083d..8e71cd4 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -719,7 +719,7 @@ .ta_offs_256bits = info_meas_ind->ta_offs_256bits, .inv_rssi = info_meas_ind->inv_rssi, .ber10k = info_meas_ind->ber10k, - .c_i = info_meas_ind->c_i_cb, + .ci_cb = info_meas_ind->c_i_cb, .is_sub = info_meas_ind->is_sub, }; break; @@ -733,7 +733,7 @@ .ta_offs_256bits = ph_tch_ind->ta_offs_256bits, .inv_rssi = abs(ph_tch_ind->rssi), .ber10k = ph_tch_ind->ber10k, - .c_i = ph_tch_ind->lqual_cb, + .ci_cb = ph_tch_ind->lqual_cb, .is_sub = ph_tch_ind->is_sub, }; break; @@ -747,7 +747,7 @@ .ta_offs_256bits = ph_data_ind->ta_offs_256bits, .inv_rssi = abs(ph_data_ind->rssi), .ber10k = ph_data_ind->ber10k, - .c_i = ph_data_ind->lqual_cb, + .ci_cb = ph_data_ind->lqual_cb, .is_sub = ph_data_ind->is_sub, }; break; @@ -758,7 +758,7 @@ DEBUGPFN(DL1P, fn, "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n", gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits, - ulm.ber10k, ulm.inv_rssi, ulm.c_i); + ulm.ber10k, ulm.inv_rssi, ulm.ci_cb); /* we assume that symbol period is 1 bit: */ set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true); diff --git a/src/common/measurement.c b/src/common/measurement.c index 1a5992b..1251b48 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -31,7 +31,7 @@ static const struct bts_ul_meas measurement_dummy = { .ber10k = MEASUREMENT_DUMMY_BER, .ta_offs_256bits = 0, - .c_i = 0, + .ci_cb = 0, .is_sub = 0, .inv_rssi = MEASUREMENT_DUMMY_IRSSI }; @@ -348,7 +348,7 @@ DEBUGPFN(DMEAS, fn, "%s adding measurement (ber10k=%u, ta_offs=%d, ci_cB=%d, is_sub=%u, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n", gsm_lchan_name(lchan), ulm->ber10k, ulm->ta_offs_256bits, - ulm->c_i, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, + ulm->ci_cb, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, fn_mod); lchan->meas.last_fn = fn; @@ -631,13 +631,13 @@ m = &lchan->meas.uplink[i + num_ul_meas_excess]; if (m->is_sub) { irssi_sub_sum += m->inv_rssi; - ci_sub_sum += m->c_i; + ci_sub_sum += m->ci_cb; num_meas_sub_actual++; is_sub = true; } irssi_full_sum += m->inv_rssi; ta256b_sum += m->ta_offs_256bits; - ci_full_sum += m->c_i; + ci_full_sum += m->ci_cb; num_ul_meas_actual++; } else { diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index ab8ae28..9494495 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -329,7 +329,7 @@ ulm.ber10k = 0; ulm.ta_offs_256bits = 256; - ulm.c_i = 0; + ulm.ci_cb = 0; ulm.is_sub = 0; ulm.inv_rssi = 90; diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h index 90f0f85..1263ac3 100644 --- a/tests/meas/meas_testcases.h +++ b/tests/meas/meas_testcases.h @@ -1,5 +1,5 @@ #define ULM(ber, ta, sub, neg_rssi) \ - { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 10, .is_sub = sub, .inv_rssi = (neg_rssi) } + { .ber10k = (ber), .ta_offs_256bits = (ta), .ci_cb = 10, .is_sub = sub, .inv_rssi = (neg_rssi) } struct meas_testcase { const char *name; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If07f7f2a3ea996cbfc6a9087fa34402e38a7fd9f Gerrit-Change-Number: 28081 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: gprs_ms_storage: Use bts_stat_item_inc/dec APIs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28073 ) Change subject: gprs_ms_storage: Use bts_stat_item_inc/dec APIs ...................................................................... gprs_ms_storage: Use bts_stat_item_inc/dec APIs Change-Id: I2957513c35a1a075440d82b0f7f2c767c69ea9cc --- M src/gprs_ms_storage.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gprs_ms_storage.cpp b/src/gprs_ms_storage.cpp index b98104d..f980824 100644 --- a/src/gprs_ms_storage.cpp +++ b/src/gprs_ms_storage.cpp @@ -28,7 +28,7 @@ static void ms_storage_ms_idle_cb(struct GprsMs *ms) { llist_del(&ms->list); - bts_stat_item_add(ms->bts, STAT_MS_PRESENT, -1); + bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); if (ms_is_idle(ms)) talloc_free(ms); } @@ -102,7 +102,7 @@ ms_set_callback(ms, &ms_storage_ms_cb); llist_add(&ms->list, &m_list); if (m_bts) - bts_stat_item_add(m_bts, STAT_MS_PRESENT, 1); + bts_stat_item_inc(m_bts, STAT_MS_PRESENT); return ms; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2957513c35a1a075440d82b0f7f2c767c69ea9cc Gerrit-Change-Number: 28073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022