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

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

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/28085 ) Change subject: measurement: move SACCH detection to process_l1sap_meas_data() ...................................................................... Patch Set 2: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/28085/comment/2e91b173_8e17a3f1 PS1, Line 725: .is_sub = info_meas_ind->is_sub, > This is done on purpose because in AMR mode the caller of this function sets .is_sub itself. […] Done -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 May 2022 13:50:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> 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

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/28085 to look at the new patch set (#2). 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(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/28085/2 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

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

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/28086 to look at the new patch set (#2). 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/2 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved 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-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

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

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/28086 ) Change subject: measurement: fix matching of SUB frames by TDMA FN ...................................................................... Patch Set 1: (3 comments) File src/common/measurement.c: https://gerrit.osmocom.org/c/osmo-bts/+/28086/comment/96cb455c_8d48a5cc PS1, Line 23: /* TCH/H(0): 0, 2, 4, 6, 52, 54, 56, 58 */ > Maybe use ";" to separate between the 2 blocks, it's easier to understand: […] In this comment it's just a set of FNs copied from 3GPP TS 45.008 as-is. Blocks with the respective FNs they consist of are listed below this comment. I don't think a semicolon makes sense here. https://gerrit.osmocom.org/c/osmo-bts/+/28086/comment/fd642245_a8d7b4af PS1, Line 26: /* TCH/H(1): 14, 16, 18, 20, 66, 68, 70, 72 */ > same Same here, blocks are listed below. This is one-to-one copy from 3GPP TS 45.008. https://gerrit.osmocom.org/c/osmo-bts/+/28086/comment/ac4879d4_c7c4c3ec PS1, Line 65: * There is only one *complete* block in this subset starting at FN=52. > So you first say there's a complete block starting at FN=52, but in next line you say the one starti […] The first FN of incomplete block {52, 53, 54, 55} is actually several FNs earlier, because on TCH/F every block is interleaved over 8 consecutive bursts. But in DTXu mode, the MS does not transmit the first 4 bursts - that's why I am not listing them in square brackets. Maybe saying {... 52, 53, 54, 55} and {56, 57, 58, 59 ...} would make it cleaner? -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 May 2022 13:26:08 +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-bts[master]: measurement: move SACCH detection to process_l1sap_meas_data()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/28085 ) Change subject: measurement: move SACCH detection to process_l1sap_meas_data() ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/28085/comment/261a2e32_bf85c471 PS1, Line 725: .is_sub = info_meas_ind->is_sub, > this looks weird. You first set it and then use it to re-set it. […] This is done on purpose because in AMR mode the caller of this function sets .is_sub itself. If it's set to true by the caller, then we know that it's a SUB frame and do nothing. If it's false, then we do some additional checks here. Doing what you suggest would break SUB detection for AMR. The correct condition would be: if (info_meas_ind->is_sub || trx_sched_is_sacch_fn(lchan->ts, fn, true)) ulm.is_sub = 1; If you find this cleaner, I'll update the patch. -- 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-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 May 2022 12:51:54 +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-pcu[master]: gprs_ms_stoage: Release all MS in ms_storage cleanup()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28078 ) Change subject: gprs_ms_stoage: Release all MS in ms_storage cleanup() ...................................................................... gprs_ms_stoage: Release all MS in ms_storage cleanup() This makes sure all MS and TBF objects under a bts are freed when its underlaying storage is freed (cleanup() is called). Related: OS#5555 Change-Id: Idf3ad8b70c97313dec38a49d48cf36d6c9b404c7 --- M src/gprs_ms_storage.cpp M tests/tbf/TbfTest.err 2 files changed, 139 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gprs_ms_storage.cpp b/src/gprs_ms_storage.cpp index f980824..c9a41c9 100644 --- a/src/gprs_ms_storage.cpp +++ b/src/gprs_ms_storage.cpp @@ -61,7 +61,10 @@ llist_for_each_safe(pos, tmp, &m_list) { struct GprsMs *ms = llist_entry(pos, typeof(*ms), list); ms_set_callback(ms, NULL); - ms_storage_ms_idle_cb(ms); + ms_set_timeout(ms, 0); + llist_del(&ms->list); + bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); + talloc_free(ms); } } diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 892b31e..51df12a 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -48,6 +48,9 @@ Modifying MS object, TLLI: 0x00002342 -> 0x00004232, already confirmed partly Modifying MS object, TLLI = 0x00004232, TA 4 -> 6 === end test_tbf_tlli_update === +MS(TLLI=0x00004232, IMSI=, TA=6, 0/0, UL DL) Destroying MS object +MS(TLLI=0x00004232, IMSI=, TA=6, 0/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0x00004232 DIR=UL STATE=NEW) +MS(TLLI=0x00004232, IMSI=, TA=6, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0x00004232 DIR=DL STATE=NEW) === start test_tbf_final_ack === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled Creating MS object, TLLI = 0xffffffff @@ -1612,6 +1615,70 @@ MS(TLLI=0xc0000020, IMSI=001001000000032, TA=220, 45/0,) No PDCH resource === end test_tbf_exhaustion === MS(TLLI=0xc0000020, IMSI=001001000000032, TA=220, 45/0,) Destroying MS object +MS(TLLI=0xc000001f, IMSI=001001000000031, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000001f, IMSI=001001000000031, TA=220, 45/0,) Detaching TBF: TBF(TFI=31 TLLI=0xc000001f DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000001e, IMSI=001001000000030, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000001e, IMSI=001001000000030, TA=220, 45/0,) Detaching TBF: TBF(TFI=30 TLLI=0xc000001e DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000001d, IMSI=001001000000029, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000001d, IMSI=001001000000029, TA=220, 45/0,) Detaching TBF: TBF(TFI=29 TLLI=0xc000001d DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000001c, IMSI=001001000000028, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000001c, IMSI=001001000000028, TA=220, 45/0,) Detaching TBF: TBF(TFI=28 TLLI=0xc000001c DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000001b, IMSI=001001000000027, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000001b, IMSI=001001000000027, TA=220, 45/0,) Detaching TBF: TBF(TFI=27 TLLI=0xc000001b DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000001a, IMSI=001001000000026, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000001a, IMSI=001001000000026, TA=220, 45/0,) Detaching TBF: TBF(TFI=26 TLLI=0xc000001a DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000019, IMSI=001001000000025, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000019, IMSI=001001000000025, TA=220, 45/0,) Detaching TBF: TBF(TFI=25 TLLI=0xc0000019 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000018, IMSI=001001000000024, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000018, IMSI=001001000000024, TA=220, 45/0,) Detaching TBF: TBF(TFI=24 TLLI=0xc0000018 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000017, IMSI=001001000000023, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000017, IMSI=001001000000023, TA=220, 45/0,) Detaching TBF: TBF(TFI=23 TLLI=0xc0000017 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000016, IMSI=001001000000022, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000016, IMSI=001001000000022, TA=220, 45/0,) Detaching TBF: TBF(TFI=22 TLLI=0xc0000016 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000015, IMSI=001001000000021, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000015, IMSI=001001000000021, TA=220, 45/0,) Detaching TBF: TBF(TFI=21 TLLI=0xc0000015 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000014, IMSI=001001000000020, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000014, IMSI=001001000000020, TA=220, 45/0,) Detaching TBF: TBF(TFI=20 TLLI=0xc0000014 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000013, IMSI=001001000000019, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000013, IMSI=001001000000019, TA=220, 45/0,) Detaching TBF: TBF(TFI=19 TLLI=0xc0000013 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000012, IMSI=001001000000018, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000012, IMSI=001001000000018, TA=220, 45/0,) Detaching TBF: TBF(TFI=18 TLLI=0xc0000012 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000011, IMSI=001001000000017, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000011, IMSI=001001000000017, TA=220, 45/0,) Detaching TBF: TBF(TFI=17 TLLI=0xc0000011 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000010, IMSI=001001000000016, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000010, IMSI=001001000000016, TA=220, 45/0,) Detaching TBF: TBF(TFI=16 TLLI=0xc0000010 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000000f, IMSI=001001000000015, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000000f, IMSI=001001000000015, TA=220, 45/0,) Detaching TBF: TBF(TFI=15 TLLI=0xc000000f DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000000e, IMSI=001001000000014, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000000e, IMSI=001001000000014, TA=220, 45/0,) Detaching TBF: TBF(TFI=14 TLLI=0xc000000e DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000000d, IMSI=001001000000013, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000000d, IMSI=001001000000013, TA=220, 45/0,) Detaching TBF: TBF(TFI=13 TLLI=0xc000000d DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000000c, IMSI=001001000000012, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000000c, IMSI=001001000000012, TA=220, 45/0,) Detaching TBF: TBF(TFI=12 TLLI=0xc000000c DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000000b, IMSI=001001000000011, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000000b, IMSI=001001000000011, TA=220, 45/0,) Detaching TBF: TBF(TFI=11 TLLI=0xc000000b DIR=DL STATE=ASSIGN) +MS(TLLI=0xc000000a, IMSI=001001000000010, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc000000a, IMSI=001001000000010, TA=220, 45/0,) Detaching TBF: TBF(TFI=10 TLLI=0xc000000a DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000009, IMSI=001001000000009, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000009, IMSI=001001000000009, TA=220, 45/0,) Detaching TBF: TBF(TFI=9 TLLI=0xc0000009 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000008, IMSI=001001000000008, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000008, IMSI=001001000000008, TA=220, 45/0,) Detaching TBF: TBF(TFI=8 TLLI=0xc0000008 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000007, IMSI=001001000000007, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000007, IMSI=001001000000007, TA=220, 45/0,) Detaching TBF: TBF(TFI=7 TLLI=0xc0000007 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000006, IMSI=001001000000006, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000006, IMSI=001001000000006, TA=220, 45/0,) Detaching TBF: TBF(TFI=6 TLLI=0xc0000006 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000005, IMSI=001001000000005, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000005, IMSI=001001000000005, TA=220, 45/0,) Detaching TBF: TBF(TFI=5 TLLI=0xc0000005 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000004, IMSI=001001000000004, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000004, IMSI=001001000000004, TA=220, 45/0,) Detaching TBF: TBF(TFI=4 TLLI=0xc0000004 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000003, IMSI=001001000000003, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000003, IMSI=001001000000003, TA=220, 45/0,) Detaching TBF: TBF(TFI=3 TLLI=0xc0000003 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000002, IMSI=001001000000002, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000002, IMSI=001001000000002, TA=220, 45/0,) Detaching TBF: TBF(TFI=2 TLLI=0xc0000002 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000001, IMSI=001001000000001, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000001, IMSI=001001000000001, TA=220, 45/0,) Detaching TBF: TBF(TFI=1 TLLI=0xc0000001 DIR=DL STATE=ASSIGN) +MS(TLLI=0xc0000000, IMSI=001001000000000, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0000000, IMSI=001001000000000, TA=220, 45/0,) Detaching TBF: TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=ASSIGN) === start test_tbf_dl_llc_loss === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled Creating MS object, TLLI = 0xffffffff @@ -1721,6 +1788,8 @@ TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) msg block (BSN 2, CS-1): 07 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 MSG = 07 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 === end test_tbf_dl_llc_loss === +MS(TLLI=0xc0123456, IMSI=001001000123456, TA=0, 45/0, DL) Destroying MS object +MS(TLLI=0xc0123456, IMSI=001001000123456, TA=0, 45/0,) Detaching TBF: TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) === start test_tbf_single_phase === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled Found first unallocated TRX=0 TFI=0 @@ -1805,6 +1874,9 @@ - TRX=0 (0) TS=7 TA=7 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) appending 4 bytes === end test_tbf_single_phase === +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) === start test_tbf_two_phase === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled MS requests Uplink resource on CCCH/RACH: ra=0x73 (8 bit) Fn=2654167 qta=31 @@ -1904,6 +1976,9 @@ TBF(DL-TFI_0){NEW}: state_chg to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) appending 4 bytes +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) === end test_tbf_two_phase === === start test_tbf_ra_update_rach === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -2169,6 +2244,9 @@ Modifying MS object, TLLI: 0xf5667788 confirmed TBF(TFI=0 TLLI=0xf5667788 DIR=DL STATE=FINISHED) appending 4 bytes New MS: TLLI = 0xf5667788, TA = 7, IMSI = 0011223344, LLC = 1 +MS(TLLI=0xf5667788, IMSI=0011223344, TA=7, 1/0, UL DL) Destroying MS object +MS(TLLI=0xf5667788, IMSI=0011223344, TA=7, 1/0, DL) Detaching TBF: TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=FLOW) +MS(TLLI=0xf5667788, IMSI=0011223344, TA=7, 1/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf5667788 DIR=DL STATE=FINISHED) === end test_tbf_ra_update_rach === === start test_tbf_dl_flow_and_rach_two_phase === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -2343,6 +2421,9 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Frame 1 starts at offset 0, length=20, is_complete=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) No gaps in received block, last block: BSN=0 CV=15 New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2 +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) === end test_tbf_dl_flow_and_rach_two_phase === === start test_tbf_dl_flow_and_rach_single_phase === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -2516,6 +2597,8 @@ UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2 +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, UL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) === end test_tbf_dl_flow_and_rach_single_phase === === start test_tbf_dl_reuse === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -3572,6 +3655,9 @@ TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 5 sec. 0 microsec, cur_fn=2654413 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654461, TS=7 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) msg block (BSN 10, CS-1): 0f 03 14 4d 43 20 50 41 43 4b 45 54 20 30 39 20 28 54 42 46 20 32 29 +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=RELEASING) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0,) Detaching TBF: TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) === end test_tbf_dl_reuse === === start test_tbf_gprs_egprs === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled @@ -3606,6 +3692,8 @@ - TRX=0 (0) TS=4 TA=220 TBF(TFI=0 TLLI=0xc0006789 DIR=DL STATE=ASSIGN) appending 256 bytes === end test_tbf_gprs_egprs === +MS(TLLI=0xc0006789, IMSI=001001123456789, TA=220, 45/0, DL) Destroying MS object +MS(TLLI=0xc0006789, IMSI=001001123456789, TA=220, 45/0,) Detaching TBF: TBF(TFI=0 TLLI=0xc0006789 DIR=DL STATE=ASSIGN) === start test_tbf_ws === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled PDCH(bts=0,trx=0,ts=2) PDCH state: disabled => enabled @@ -3807,6 +3895,9 @@ TBF(DL-TFI_0){NEW}: state_chg to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) === end test_tbf_egprs_two_phase === === start test_tbf_egprs_two_phase_spb === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -4038,6 +4129,9 @@ TBF(DL-TFI_0){NEW}: state_chg to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) === end test_tbf_egprs_two_phase_spb === === start test_tbf_egprs_dl === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled @@ -6886,6 +6980,9 @@ TBF(DL-TFI_0){NEW}: state_chg to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) === end test_tbf_puan_urbb_len === === start test_tbf_update_ws === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled @@ -7069,6 +7166,9 @@ TBF(DL-TFI_0){NEW}: state_chg to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) === end test_tbf_li_decoding === === start test_tbf_epdan_out_of_rx_window === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled @@ -7348,6 +7448,20 @@ No PDCH resource for Uplink TBF Tx Immediate Assignment Reject on AGCH MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=FLOW) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=5 TLLI=0xffffffff DIR=UL STATE=FLOW) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=4 TLLI=0xffffffff DIR=UL STATE=FLOW) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=3 TLLI=0xffffffff DIR=UL STATE=FLOW) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=2 TLLI=0xffffffff DIR=UL STATE=FLOW) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=1 TLLI=0xffffffff DIR=UL STATE=FLOW) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) === end test_immediate_assign_rej_multi_block === === start test_immediate_assign_rej_single_block === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -8620,6 +8734,9 @@ Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)', TA=7 Got MS: TLLI = 0xf1223344, TA = 7 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, UL DL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/1,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) === end test_tbf_egprs_two_phase_puan === === start test_packet_access_rej_epdan === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled @@ -8666,6 +8783,8 @@ UL_ASS_TBF(DL-TFI_0){SEND_ASS_REJ}: Received Event CREATE_RLCMAC_MSG UL_ASS_TBF(DL-TFI_0){SEND_ASS_REJ}: state_chg to NONE packet reject: 40 84 7f f7 6e e6 7e ab 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +MS(TLLI=0xffeeddcc, IMSI=, TA=0, 11/11, DL) Destroying MS object +MS(TLLI=0xffeeddcc, IMSI=, TA=0, 11/11,) Detaching TBF: TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) === end test_packet_access_rej_epdan === === start test_packet_access_rej_prr === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled @@ -9124,6 +9243,22 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) Scheduled UL Assignment polling on PACCH (FN=2654231, TS=7) UL_ASS_TBF(UL-TFI_0){SEND_ASS}: state_chg to WAIT_ACK PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddd3, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddd3, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=-1 TLLI=0xffeeddd3 DIR=UL STATE=ASSIGN) +MS(TLLI=0xffeeddd2, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddd2, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddd1, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddd1, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddd0, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddd0, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddcf, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddcf, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddce, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddce, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddcd, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddcd, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) +MS(TLLI=0xffeeddcc, IMSI=, TA=7, 11/11, UL) Destroying MS object +MS(TLLI=0xffeeddcc, IMSI=, TA=7, 11/11,) Detaching TBF: TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) === end test_packet_access_rej_prr === === start test_packet_access_rej_prr_no_other_tbfs === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idf3ad8b70c97313dec38a49d48cf36d6c9b404c7 Gerrit-Change-Number: 28078 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: bts: Call gprs_bssgp_destroy() in destructor

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28076 ) Change subject: bts: Call gprs_bssgp_destroy() in destructor ...................................................................... bts: Call gprs_bssgp_destroy() in destructor Change-Id: I7ed7f489f36f88277e2d5e393edcb339bf0cbba0 --- M src/bts.cpp M tests/tbf/TbfTest.cpp 2 files changed, 9 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 5c870af..e955687 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -245,6 +245,8 @@ bts->ms_store->cleanup(); delete bts->ms_store; + gprs_bssgp_destroy(bts); + osmo_time_cc_cleanup(&bts->all_allocated_pdch); if (bts->ratectrs) { diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 4651269..585496a 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -528,7 +528,6 @@ OSMO_ASSERT(rc == -EBUSY); fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(bts); TALLOC_FREE(the_pcu); } @@ -623,7 +622,6 @@ fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(bts); TALLOC_FREE(the_pcu); } @@ -2271,14 +2269,12 @@ OSMO_ASSERT(rc == 0); fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(bts); TALLOC_FREE(the_pcu); } static inline void ws_check(gprs_rlcmac_dl_tbf *dl_tbf, const char *test, uint8_t exp_slots, uint16_t exp_ws, - bool free, bool end) + bool free) { - gprs_rlcmac_bts *bts = dl_tbf->bts; if (!dl_tbf) { fprintf(stderr, "%s(): FAILED (NULL TBF)\n", test); return; @@ -2297,11 +2293,6 @@ if (free) tbf_free(dl_tbf); - - if (end) { - fprintf(stderr, "=== end %s ===\n", test); - gprs_bssgp_destroy(bts); - } } static void test_tbf_ws() @@ -2337,7 +2328,7 @@ ms = bts_alloc_ms(bts, ms_class, 0); dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, false); - ws_check(dl_tbf, __func__, 4, 64, true, false); + ws_check(dl_tbf, __func__, 4, 64, true); /* EGPRS-only */ @@ -2345,7 +2336,8 @@ ms = bts_alloc_ms(bts, ms_class, ms_class); dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, false); - ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true, true); + ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true); + fprintf(stderr, "=== end %s ===\n", __func__); TALLOC_FREE(the_pcu); } @@ -2384,12 +2376,13 @@ ms = bts_alloc_ms(bts, ms_class, ms_class); dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, true); - ws_check(dl_tbf, __func__, 1, 128 + 1 * 64, false, false); + ws_check(dl_tbf, __func__, 1, 128 + 1 * 64, false); dl_tbf->update(); /* window size should be 384 */ - ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true, true); + ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true); + fprintf(stderr, "=== end %s ===\n", __func__); TALLOC_FREE(the_pcu); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7ed7f489f36f88277e2d5e393edcb339bf0cbba0 Gerrit-Change-Number: 28076 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: TbfTest: Reset MS timeout to 0 in test_tbf_dl_llc_loss()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28077 ) Change subject: TbfTest: Reset MS timeout to 0 in test_tbf_dl_llc_loss() ...................................................................... TbfTest: Reset MS timeout to 0 in test_tbf_dl_llc_loss() The timeout is set to a high value to avoid freeing the MS during main loop iteration. Let's set it back to 0 to have a common free path in test infrastructure. Change-Id: I6dc4765163fde1a46574b49f3185aea65391e0d0 --- M tests/tbf/TbfTest.cpp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 585496a..116b234 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -622,6 +622,8 @@ fprintf(stderr, "=== end %s ===\n", __func__); + /* Restore MS release timeout to 0 to make sure it is freed immediately: */ + ms_set_timeout(ms, 0); TALLOC_FREE(the_pcu); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6dc4765163fde1a46574b49f3185aea65391e0d0 Gerrit-Change-Number: 28077 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: gprs_pcu: Explicitly free all bts objects in list before freeing pcu

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28075 ) Change subject: gprs_pcu: Explicitly free all bts objects in list before freeing pcu ...................................................................... gprs_pcu: Explicitly free all bts objects in list before freeing pcu This is mostly important to unit tests, where the gprs_pcu object is recreated several times (it is not recreated in normal operation). The BTS objects are already being freed through talloc dependency tree. However, since they may trigger counter updates, access to the pcu list, etc, let's better do it explicitly before erasing gprs_pcu object fields. Related: OS#5555 Change-Id: If2a8360e214d993a8a89993532ff1099b30bdbb1 --- M src/gprs_pcu.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index e8dba06..ecb7f29 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -61,6 +61,10 @@ static int gprs_pcu_talloc_destructor(struct gprs_pcu *pcu) { + struct gprs_rlcmac_bts *bts; + while ((bts = llist_first_entry_or_null(&pcu->bts_list, struct gprs_rlcmac_bts, list))) + talloc_free(bts); + if (osmo_timer_pending(&pcu->update_stats_timer)) osmo_timer_del(&pcu->update_stats_timer); neigh_cache_free(pcu->neigh_cache); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If2a8360e214d993a8a89993532ff1099b30bdbb1 Gerrit-Change-Number: 28075 Gerrit-PatchSet: 1 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-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