Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 )
Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()
......................................................................
Patch Set 1:
(1 comment)
File src/host/trxcon/src/trxcon.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/28862/comment/99bb3f4c_749a77b7
PS1, Line 270: /* Reparent trxcon_inst from ctx to trxcon->fi */
> We're dealing with a chicken-egg problem here. […]
I think it's much more clearer doing this instead of mangling with talloc contexts:
fi = osmo_fsm_inst_alloc( priv = NULL)
fi->priv = trxcon = talloc_zero(fi, struct trxcon_inst);
trxcon->fi = fi;
BTW FYI, I've seen usually this solved/workarounded by using talloc_steal during the cleanup callback when freeing the fi->priv.
Let's see what other think about this topic. I'd really avoid reparenting and this kind of stuff as much as possible, otherwise there's a high potential of shooting at your/someone else's foot later on when updating the code.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c
Gerrit-Change-Number: 28862
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 01 Aug 2022 12:52:45 +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
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 )
Change subject: trxcon: l1sched: ensure n_bits_total is always initialized
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> Doesn't look like an issue at first glance, but fine.
Coverity tells us it can be an issue. Check CID#205451.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125
Gerrit-Change-Number: 28866
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 01 Aug 2022 12:48:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 )
Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()
......................................................................
Patch Set 1:
(1 comment)
File src/host/trxcon/src/trxcon.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/28862/comment/f205ae69_821d626f
PS1, Line 270: /* Reparent trxcon_inst from ctx to trxcon->fi */
> Here again, reparenting makes everything more convoluted and difficult to follow imho, and must be u […]
We're dealing with a chicken-egg problem here. trxcon_inst is allocated first because a) it holds a pointer to an FSM instance, so we can do trxcon->fi = osmo_fsm_inst_alloc(...) directly; b) we pass a pointer to trxcon_inst when calling osmo_fsm_inst_alloc(), so it becomes fi->priv. To me using talloc_reparent() does not really look that critical.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c
Gerrit-Change-Number: 28862
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: Mon, 01 Aug 2022 12:46:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28880 )
Change subject: BTS_Tests: separate f_send_meas_rep() from f_transceive_meas_rep()
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28880
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ia5d0315e053702df5fa8dad8c6c66c11c9f3edcb
Gerrit-Change-Number: 28880
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-Comment-Date: Mon, 01 Aug 2022 12:41:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28868 )
Change subject: BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up
......................................................................
BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up
A comment in f_TC_rsl_ms_pwr_dyn_up() states:
> By default, the MS power loop gets triggered every 4th SACCH block (1.92s).
> We need 9 * 4 dB steps to get from 0 dBm to 33 dBm, so 9 * 1.92s total.
> Add an extra offset to avoid race conditions: +1.92s.
so the alt statement is expected to block for 19.2s, while the guard
timer is set to 20.0s by default. This is not enough, given that
f_TC_rsl_ms_pwr_dyn_up() also needs to wait for the first SACCH block
before entering the alt statement.
Let's give it more time to run in order to avoid sporadic failures.
Change-Id: Ib7de8383c95ac9e00560f786ec4c56f79f7d81bc
Related: OS#5635
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index a322fde..223e55b 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -3335,7 +3335,7 @@
f_init();
f_vty_config(BTSVTY, "phy 0", "osmotrx ms-power-loop -10");
for (var integer tn := 1; tn <= 1; tn := tn+1) {
- pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN));
+ pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN, t_guard := 30.0));
pars.bts0_band := f_vty_get_bts0_band();
vc_conn := f_start_handler(refers(f_TC_rsl_ms_pwr_dyn_up), pars, trxc_comp := true);
vc_conn.done;
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28868
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ib7de8383c95ac9e00560f786ec4c56f79f7d81bc
Gerrit-Change-Number: 28868
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 )
Change subject: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)
......................................................................
BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)
This helps to find where the problem is a lot quicker.
Change-Id: I71ab69d85f453964749270d970c55e6f577a73a1
---
M bts/BTS_Tests.ttcn
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
Objections:
laforge: I would prefer this is not merged as is
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 0f55c54..6772cc5 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -7061,9 +7061,11 @@
/* establish one Radio Link Layer via SABM -> UA. Use l3 for contention resolution */
private function f_est_rll_mo(uint3_t sapi, RslLinkId link_id, octetstring l3) runs on ConnHdlr {
+ timer T := 2.0;
/* send SABM from MS -> BTS */
f_tx_lapdm(ts_LAPDm_SABM(sapi, cr_MO_CMD, true, l3), link_id);
/* expect RLL EST IND on Abis */
+ T.start;
alt {
[l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3));
[l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id));
@@ -7071,6 +7073,9 @@
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Failing due to RSL_ERROR_IND");
}
[] RSL.receive { repeat; }
+ [] T.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for RLL EST IND");
+ }
}
/* expect UA from BTS -> MS */
f_l1_exp_lapdm(tr_LAPDm_UA(sapi, cr_MT_RSP, true, l3));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I71ab69d85f453964749270d970c55e6f577a73a1
Gerrit-Change-Number: 28832
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28833 )
Change subject: BTS_Tests: tune back to CCCH/BCCH in TC_sacch_chan_act_ho_[a]sync
......................................................................
BTS_Tests: tune back to CCCH/BCCH in TC_sacch_chan_act_ho_[a]sync
Sending L1CTL_DM_REL_REQ does not make the L1 tune back to CCCH/BCCH.
We need to send a L1CTL_FBSB_REQ after releasing a dedicated channel
if we want to establish another one. This is essential when running
tests using Calypso PHY, and will be required once we have proper
trxcon_fsm implementation [1] merged.
Related: [1] osmocom-bb.git Ifaf63ead9dd180181358e771367b2a686ba159ca
Change-Id: I65fb243a62fc7670b43f467d6b79268cdfb98f36
---
M bts/BTS_Tests.ttcn
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 6772cc5..a322fde 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1456,6 +1456,9 @@
f_rsl_chan_deact();
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ /* Tune back to CCCH/BCCH */
+ f_l1_tune(L1CTL);
+
/* Step 2: Activate ASYNC HO channel with MS power IE */
@@ -1533,6 +1536,9 @@
f_rsl_chan_deact();
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ /* Tune back to CCCH/BCCH */
+ f_l1_tune(L1CTL);
+
/* Step 2a: Activate SYNC HO channel with only MS power IE */
@@ -1558,6 +1564,9 @@
f_rsl_chan_deact();
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ /* Tune back to CCCH/BCCH */
+ f_l1_tune(L1CTL);
+
/* Step 2b: Activate SYNC HO channel with TA IE */
@@ -1582,6 +1591,9 @@
f_rsl_chan_deact();
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ /* Tune back to CCCH/BCCH */
+ f_l1_tune(L1CTL);
+
/* Step 3: Activate SYNC HO channel with MS power IE and TA IE */
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28833
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I65fb243a62fc7670b43f467d6b79268cdfb98f36
Gerrit-Change-Number: 28833
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged