Attention is currently required from: Hoernchen, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email )
Change subject: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
......................................................................
Patch Set 2: Verified+1 Code-Review+1
(1 comment)
Patchset:
PS2:
It was confirmed [on mssdr setup] that this patch fixes the problem.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
Gerrit-Change-Number: 34622
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 03 Oct 2023 16:36:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email )
Change subject: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
......................................................................
rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
The FSM can be reused several times to assign a UL TBF over its
lifespan, eg. if a DL TBF DL ACK/NACK is reuse to request allocation of
a UL TBF several times.
Some state like ctx->tbf_starting_time_exists was being left as =true
during the initial run of the FSM, and as a result subsequent runs going
through the check delaying completing after sending the PKT CTRL ACK.
Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/22/34622/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
Gerrit-Change-Number: 34622
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email )
Change subject: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
......................................................................
rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
The FSM can be reused several times to assign a UL TBF over its
lifespan, eg. if a DL TBF DL ACK/NACK is reuse to request allocation of
a UL TBF several times.
Some state like ctx->tbf_starting_time_exists was being left as =true
during the initial run of the FSM, and as a result subsequent runs going
through the check delaying completing after sending the PKT CTRL ACK.
Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 31 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/22/34622/1
diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c
index 5b5a892..df5b799 100644
--- a/src/rlcmac/tbf_ul_ass_fsm.c
+++ b/src/rlcmac/tbf_ul_ass_fsm.c
@@ -128,6 +128,12 @@
static int handle_imm_ass(struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx, const struct tbf_ul_ass_ev_rx_ccch_imm_ass_ctx *d)
{
+ /* reset previous state: */
+ memset(&ctx->phase1_alloc, 0, sizeof(ctx->phase1_alloc));
+ ctx->sba = true;
+ ctx->tbf_starting_time_exists = false;
+ ctx->tbf_starting_time = 0;
+
/* TS 44.018 10.5.2.16 IA Rest Octets */
switch (d->iaro->UnionType) {
case 1: /* d->iaro->u.lh.* (IA_RestOctetsLH_t) */
@@ -195,6 +201,12 @@
const Timeslot_Allocation_t *ts_alloc;
const Timeslot_Allocation_Power_Ctrl_Param_t *ts_alloc_pwr_ctl;
+ /* reset previous state: */
+ memset(&ctx->phase2_alloc, 0, sizeof(ctx->phase2_alloc));
+ ctx->sba = false;
+ ctx->tbf_starting_time_exists = false;
+ ctx->tbf_starting_time = 0;
+
switch (ulass->UnionType) {
case 0: /* ulass->u.PUA_GPRS_Struct.* (PUA_GPRS_t) */
ctx->ul_tbf->tx_cs = ulass->u.PUA_GPRS_Struct.CHANNEL_CODING_COMMAND + 1;
@@ -258,7 +270,9 @@
ctx->dl_tbf = NULL;
memset(&ctx->phase1_alloc, 0, sizeof(ctx->phase1_alloc));
memset(&ctx->phase2_alloc, 0, sizeof(ctx->phase2_alloc));
+ ctx->sba = false;
ctx->tbf_starting_time_exists = false;
+ ctx->tbf_starting_time = 0;
}
static void st_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data)
@@ -369,7 +383,6 @@
data_ctx->msg = create_pkt_resource_req(ctx, data_ctx);
if (!data_ctx->msg)
return;
- ctx->sba = false; /* Reset state */
tbf_ul_ass_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_PKT_UL_ASS);
break;
default:
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
Gerrit-Change-Number: 34622
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34597?usp=email )
Change subject: meas: also match stderr logging for meas_test
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Patchset:
PS2:
> not entirely sure if we really want to match 1:1 each character in hundreds of lines of measurement […]
I think it should not be a problem as long as a) the logging formatting is properly configured (no filename, line numbers, timestamps); b) we're matching only `DMEAS` logging and nothing else. This helps to understand how the logic actually behaves under the hood and for instance helped me with fixing a bug (https://gerrit.osmocom.org/c/osmo-bts/+/34598).
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34597?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id1ce154a65b194ce5fd9257c9c1b26d62aad1e0d
Gerrit-Change-Number: 34597
Gerrit-PatchSet: 2
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: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 03 Oct 2023 16:18:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34607?usp=email )
Change subject: socket: Introduce APIs osmo_sock_multiaddr_{add,del}_local_addr()
......................................................................
Patch Set 1: Code-Review+1
(2 comments)
File src/core/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/34607/comment/982bafcc_6face1f8
PS1, Line 1279: char strbuf[512];
can be moved to the scope of `if` below, but not critical
https://gerrit.osmocom.org/c/libosmocore/+/34607/comment/0e0fffde_5ecedcff
PS1, Line 1355: strbuf
same here
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34607?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ifc6e7d643c2a0c53f479bfd0d5c36d08c0c01953
Gerrit-Change-Number: 34607
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 03 Oct 2023 16:17:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment