June 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[master]: stream: Drop dot at the end of log line

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33224 ) Change subject: stream: Drop dot at the end of log line ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I59b0e56088c60e3de5f3a2f38f158e16074a65c9 Gerrit-Change-Number: 33224 Gerrit-PatchSet: 2 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-MessageType: abandon

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_{ul,dl}_fsm: Remove unneeded asserts

by pespin

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-pcu/+/33260 to look at the new patch set (#4). Change subject: tbf_{ul,dl}_fsm: Remove unneeded asserts ...................................................................... tbf_{ul,dl}_fsm: Remove unneeded asserts Those are leftovers from the time where we had a single tbf_fsm for both UL and DL TBF. Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea --- M src/tbf_dl_fsm.c M src/tbf_ul_fsm.c 2 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/33260/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea Gerrit-Change-Number: 33260 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequ...

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33259 to look at the new patch set (#3). Change subject: tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequence ...................................................................... tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequence T3169 is triggered as consequence of N3101 and N3103 reaching MAX. Those counters are related to UL TBF only, and hence T3169 also only applies to UL TBFs. The references to T3169 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I02f7654518da617ce6704d807d34761dbadecf07 --- M src/tbf_dl_fsm.c M src/tbf_fsm.h 2 files changed, 19 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/33259/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I02f7654518da617ce6704d807d34761dbadecf07 Gerrit-Change-Number: 33259 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_ul_fsm: Remoe 3195 references, simplify T3169 set up as consequence

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33264 to look at the new patch set (#2). Change subject: tbf_ul_fsm: Remoe 3195 references, simplify T3169 set up as consequence ...................................................................... tbf_ul_fsm: Remoe 3195 references, simplify T3169 set up as consequence T3195 is triggered as consequence of N3105 reaching MAX, which only occurs in DL TBFs. Hence, T3195 also only applies to DL TBFs. The references to T3195 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I07a43c13289d50707115187a3f22df21443a7b4a --- M src/tbf_fsm.h M src/tbf_ul_fsm.c M tests/tbf/TbfTest.err 3 files changed, 22 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/33264/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I07a43c13289d50707115187a3f22df21443a7b4a Gerrit-Change-Number: 33264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_{ul,dl}_fsm: remove impossible dst state transitions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33261 ) Change subject: tbf_{ul,dl}_fsm: remove impossible dst state transitions ...................................................................... tbf_{ul,dl}_fsm: remove impossible dst state transitions There's no code path triggering change to those states. Change-Id: I05b3019e12ec37e11ac2561a94b2eacec8718755 --- M src/tbf_dl_fsm.c M src/tbf_ul_fsm.c 2 files changed, 14 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/61/33261/1 diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c index 2a48635..9c46076 100644 --- a/src/tbf_dl_fsm.c +++ b/src/tbf_dl_fsm.c @@ -374,8 +374,7 @@ X(TBF_EV_ASSIGN_ADD_CCCH) | X(TBF_EV_ASSIGN_ADD_PACCH), .out_state_mask = - X(TBF_ST_ASSIGN) | - X(TBF_ST_RELEASING), + X(TBF_ST_ASSIGN), .name = "NEW", .action = st_new, }, diff --git a/src/tbf_ul_fsm.c b/src/tbf_ul_fsm.c index 11ed8ab..13dc9fb 100644 --- a/src/tbf_ul_fsm.c +++ b/src/tbf_ul_fsm.c @@ -312,8 +312,7 @@ X(TBF_EV_ASSIGN_ADD_PACCH), .out_state_mask = X(TBF_ST_ASSIGN) | - X(TBF_ST_FLOW) | - X(TBF_ST_RELEASING), + X(TBF_ST_FLOW), .name = "NEW", .action = st_new, }, @@ -325,8 +324,7 @@ X(TBF_EV_MAX_N3105), .out_state_mask = X(TBF_ST_FLOW) | - X(TBF_ST_FINISHED) | - X(TBF_ST_RELEASING), + X(TBF_ST_FINISHED), .name = "ASSIGN", .action = st_assign, .onenter = st_assign_on_enter, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05b3019e12ec37e11ac2561a94b2eacec8718755 Gerrit-Change-Number: 33261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequ...

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33259 to look at the new patch set (#2). Change subject: tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequence ...................................................................... tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequence T3169 is triggered as consequence of N3101 and N3103 reaching MAX. Those counters are related to UL TBF only, and hence T3169 also only applies to UL TBFs. The references to T3169 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I02f7654518da617ce6704d807d34761dbadecf07 --- M src/tbf_dl_fsm.c M src/tbf_fsm.h 2 files changed, 19 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/33259/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I02f7654518da617ce6704d807d34761dbadecf07 Gerrit-Change-Number: 33259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: Avoid using N3103 in DL TBFs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33262 ) Change subject: Avoid using N3103 in DL TBFs ...................................................................... Avoid using N3103 in DL TBFs N3103 counts retransmits of PACKET UPLINK ACK/NACK with FinalACK=1. As a consequence, this counter only applies to UL TBFs. Current code is only using it in UL TBF, but add an assert to clarify and make sure it is not used unproperly in the future. Change-Id: I026d6145249ef19694f673ec7b4928af9d401dd6 --- M src/tbf.cpp 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/62/33262/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index bc5411a..47256f8 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -313,6 +313,9 @@ case N3101: OSMO_ASSERT(direction == GPRS_RLCMAC_UL_TBF); break; + case N3103: + OSMO_ASSERT(direction == GPRS_RLCMAC_UL_TBF); + break; default: break; } @@ -335,6 +338,7 @@ chk = bts->n3101; break; case N3103: + OSMO_ASSERT(direction == GPRS_RLCMAC_UL_TBF); chk = bts->n3103; break; case N3105: -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I026d6145249ef19694f673ec7b4928af9d401dd6 Gerrit-Change-Number: 33262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: tbf_ul_fsm: Remoe 3195 references, simplify T3169 set up as consequence

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33264 ) Change subject: tbf_ul_fsm: Remoe 3195 references, simplify T3169 set up as consequence ...................................................................... tbf_ul_fsm: Remoe 3195 references, simplify T3169 set up as consequence T3195 is triggered as consequence of N3105 reaching MAX, which only occurs in DL TBFs. Hence, T3195 also only applies to DL TBFs. The references to T3195 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I07a43c13289d50707115187a3f22df21443a7b4a --- M src/tbf_fsm.h M src/tbf_ul_fsm.c M tests/tbf/TbfTest.err 3 files changed, 22 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/33264/1 diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index 6e9e478..cb075f1 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -70,7 +70,6 @@ struct gprs_rlcmac_ul_tbf *ul_tbf; }; uint32_t state_flags; - unsigned int T_release; /* Timer to be used to end release: T3169 or T3195 */ }; extern struct osmo_fsm tbf_dl_fsm; diff --git a/src/tbf_ul_fsm.c b/src/tbf_ul_fsm.c index 231ccd2..6160584 100644 --- a/src/tbf_ul_fsm.c +++ b/src/tbf_ul_fsm.c @@ -31,10 +31,10 @@ static const struct osmo_tdef_state_timeout tbf_ul_fsm_timeouts[32] = { [TBF_ST_NEW] = {}, - [TBF_ST_ASSIGN] = { }, - [TBF_ST_FLOW] = { }, + [TBF_ST_ASSIGN] = {}, + [TBF_ST_FLOW] = {}, [TBF_ST_FINISHED] = {}, - [TBF_ST_RELEASING] = {}, + [TBF_ST_RELEASING] = { .T = 3169 }, }; /* Transition to a state, using the T timer defined in tbf_fsm_timeouts. @@ -43,7 +43,7 @@ #define tbf_ul_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \ tbf_ul_fsm_timeouts, \ - the_pcu->T_defs, \ + tbf_ms(((struct tbf_dl_fsm_ctx *)(fi->priv))->tbf)->bts->T_defs_bts, \ -1) static void mod_ass_type(struct tbf_ul_fsm_ctx *ctx, uint8_t t, bool set) @@ -190,7 +190,6 @@ tbf_ul_fsm_state_chg(fi, TBF_ST_FINISHED); break; case TBF_EV_MAX_N3101: - ctx->T_release = 3169; tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); break; default: @@ -233,7 +232,6 @@ ms_unref(ms, __func__); break; case TBF_EV_MAX_N3103: - ctx->T_release = 3169; tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); break; default: @@ -243,22 +241,10 @@ static void st_releasing_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - struct tbf_ul_fsm_ctx *ctx = (struct tbf_ul_fsm_ctx *)fi->priv; - unsigned long val; - - if (!ctx->T_release) - return; - - /* In general we should end up here with an assigned timer in ctx->T_release. Possible values are: - * T3195: Wait for reuse of TFI(s) when there is no response from the MS - * (radio failure or cell change) for this TBF/MBMS radio bearer. - * T3169: Wait for reuse of USF and TFI(s) after the MS uplink assignment for this TBF is invalid. + /* T3169 has been set entering this state: Wait for reuse of USF and + * TFI(s) after the MS uplink assignment for this TBF is invalid. Upon + * timeout, the timer_cb does tbf_free(). */ - val = osmo_tdef_get(tbf_ms(ctx->tbf)->bts->T_defs_bts, ctx->T_release, OSMO_TDEF_S, -1); - fi->T = ctx->T_release; - LOGPTBFUL(ctx->ul_tbf, LOGL_DEBUG, "starting timer T%u with %lu sec. %u microsec\n", - ctx->T_release, val, 0); - osmo_timer_schedule(&fi->timer, val, 0); } static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -277,7 +263,6 @@ LOGPTBFUL(ctx->ul_tbf, LOGL_NOTICE, "releasing due to PACCH assignment timeout.\n"); /* fall-through */ case 3169: - case 3195: tbf_free(ctx->tbf); break; default: diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 7ffebea..9e75001 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -3797,7 +3797,6 @@ TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} N3101 exceeded MAX (10) UL_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Received Event MAX_N3101 UL_TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW}: state_chg to RELEASING -TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){RELEASING} starting timer T3169 with 5 sec. 0 microsec PDCH(bts=0,trx=0,ts=7) Expiring FN=2654379 but previous FN=2654322 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654322): TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){RELEASING} TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){RELEASING} N3101 10 => 11 (< MAX 10) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I07a43c13289d50707115187a3f22df21443a7b4a Gerrit-Change-Number: 33264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-pcu[master]: Avoid using N3105 in UL TBFs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33263 ) Change subject: Avoid using N3105 in UL TBFs ...................................................................... Avoid using N3105 in UL TBFs This counter is only used in DL TBFs as per TS 44.060. section 13.4 "N3105": "When the network after sending a RRBP field in the _downlink RLC data block_ ..." (DL data blocks are only sent in DL TBFs). section 8.1.2.1: "If N3105 = N3105max, the network shall release the downlink TBF internally and start timer T3195 for that TBF. When T3195 expires, the network may reuse the TFI" Change-Id: I4d4f4d4d3e6e0539ea8ec2395bed00d059b84e04 --- M src/pdch.cpp M src/tbf.cpp M src/tbf_ul_fsm.c M tests/tbf/TbfTest.err 4 files changed, 34 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/63/33263/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 2cee011..f871d1d 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -391,8 +391,8 @@ } LOGPTBF(tbf, LOGL_DEBUG, "[DOWNLINK] UPLINK ASSIGNED\n"); pdch_ulc_release_fn(ulc, fn); - /* reset N3105 */ - tbf->n_reset(N3105); + if (tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF) + tbf->n_reset(N3105); osmo_fsm_inst_dispatch(tbf->ul_ass_fsm.fi, TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, NULL); new_tbf = ms_ul_tbf(ms); @@ -422,8 +422,8 @@ } LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] DOWNLINK ASSIGNED\n"); pdch_ulc_release_fn(ulc, fn); - /* reset N3105 */ - tbf->n_reset(N3105); + if (tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF) + tbf->n_reset(N3105); osmo_fsm_inst_dispatch(tbf->dl_ass_fsm.fi, TBF_DL_ASS_EV_RX_ASS_CTRL_ACK, NULL); new_tbf = ms_dl_tbf(ms); diff --git a/src/tbf.cpp b/src/tbf.cpp index 47256f8..885c602 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -316,6 +316,9 @@ case N3103: OSMO_ASSERT(direction == GPRS_RLCMAC_UL_TBF); break; + case N3105: + OSMO_ASSERT(direction == GPRS_RLCMAC_DL_TBF); + break; default: break; } @@ -342,6 +345,7 @@ chk = bts->n3103; break; case N3105: + OSMO_ASSERT(direction == GPRS_RLCMAC_DL_TBF); chk = bts->n3105; break; default: @@ -513,7 +517,7 @@ } bts_do_rate_ctr_inc(bts, CTR_RLC_ASS_TIMEDOUT); bts_do_rate_ctr_inc(bts, CTR_PUA_POLL_TIMEDOUT); - if (n_inc(N3105)) { + if (this->direction == GPRS_RLCMAC_DL_TBF && n_inc(N3105)) { osmo_fsm_inst_dispatch(this->state_fi, TBF_EV_MAX_N3105, NULL); bts_do_rate_ctr_inc(bts, CTR_RLC_ASS_FAILED); bts_do_rate_ctr_inc(bts, CTR_PUA_POLL_FAILED); @@ -532,7 +536,7 @@ } bts_do_rate_ctr_inc(bts, CTR_RLC_ASS_TIMEDOUT); bts_do_rate_ctr_inc(bts, CTR_PDA_POLL_TIMEDOUT); - if (n_inc(N3105)) { + if (this->direction == GPRS_RLCMAC_DL_TBF && n_inc(N3105)) { osmo_fsm_inst_dispatch(this->state_fi, TBF_EV_MAX_N3105, NULL); bts_do_rate_ctr_inc(bts, CTR_RLC_ASS_FAILED); bts_do_rate_ctr_inc(bts, CTR_PDA_POLL_FAILED); diff --git a/src/tbf_ul_fsm.c b/src/tbf_ul_fsm.c index 13dc9fb..231ccd2 100644 --- a/src/tbf_ul_fsm.c +++ b/src/tbf_ul_fsm.c @@ -152,12 +152,6 @@ } tbf_ul_fsm_state_chg(fi, TBF_ST_FLOW); break; - case TBF_EV_MAX_N3105: - /* We are going to release, so abort any Pkt Ul Ass pending to be scheduled: */ - osmo_fsm_inst_dispatch(tbf_ul_ass_fi(ctx->tbf), TBF_UL_ASS_EV_ABORT, NULL); - ctx->T_release = 3195; - tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); - break; default: OSMO_ASSERT(0); } @@ -199,10 +193,6 @@ ctx->T_release = 3169; tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); break; - case TBF_EV_MAX_N3105: - ctx->T_release = 3195; - tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); - break; default: OSMO_ASSERT(0); } @@ -246,10 +236,6 @@ ctx->T_release = 3169; tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); break; - case TBF_EV_MAX_N3105: - ctx->T_release = 3195; - tbf_ul_fsm_state_chg(fi, TBF_ST_RELEASING); - break; default: OSMO_ASSERT(0); } @@ -278,11 +264,6 @@ static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { - case TBF_EV_MAX_N3105: - /* This may be received here if the TBF had several polls - * allocated concurrently and several failed each increasing N3105 - * over MAX_N3015. We are already releasing, ignore.*/ - break; default: OSMO_ASSERT(0); } @@ -320,8 +301,7 @@ .in_event_mask = X(TBF_EV_ASSIGN_ADD_CCCH) | X(TBF_EV_ASSIGN_ADD_PACCH) | - X(TBF_EV_ASSIGN_ACK_PACCH) | - X(TBF_EV_MAX_N3105), + X(TBF_EV_ASSIGN_ACK_PACCH), .out_state_mask = X(TBF_ST_FLOW) | X(TBF_ST_FINISHED), @@ -334,8 +314,7 @@ X(TBF_EV_FIRST_UL_DATA_RECVD) | X(TBF_EV_CONTENTION_RESOLUTION_MS_SUCCESS) | X(TBF_EV_LAST_UL_DATA_RECVD) | - X(TBF_EV_MAX_N3101) | - X(TBF_EV_MAX_N3105), + X(TBF_EV_MAX_N3101), .out_state_mask = X(TBF_ST_ASSIGN) | X(TBF_ST_FINISHED) | @@ -347,18 +326,15 @@ .in_event_mask = X(TBF_EV_CONTENTION_RESOLUTION_MS_SUCCESS) | X(TBF_EV_FINAL_UL_ACK_CONFIRMED) | - X(TBF_EV_MAX_N3103) | - X(TBF_EV_MAX_N3105), + X(TBF_EV_MAX_N3103), .out_state_mask = X(TBF_ST_RELEASING), .name = "FINISHED", .action = st_finished, }, [TBF_ST_RELEASING] = { - .in_event_mask = - X(TBF_EV_MAX_N3105), - .out_state_mask = - 0, + .in_event_mask = 0, + .out_state_mask = 0, .name = "RELEASING", .action = st_releasing, .onenter = st_releasing_on_enter, diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 36e1c19..7ffebea 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -9658,7 +9658,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=56 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 56) -TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){WAIT_ACK}: state_chg to SEND_ASS @@ -9715,7 +9714,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=60 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 60) -TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} N3105 1 => 2 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){WAIT_ACK}: state_chg to SEND_ASS @@ -9772,7 +9770,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=65 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 65) -TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){WAIT_ACK}: state_chg to SEND_ASS @@ -9829,7 +9826,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=69 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 69) -TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} N3105 2 => 3 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-0:E:TLLI-0xffeeddcc){WAIT_ACK}: state_chg to SEND_ASS @@ -9886,7 +9882,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=73 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-2:E:TLLI-0xffeeddce){ASSIGN} TBF(UL:TFI-0-0-2:E:TLLI-0xffeeddce){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 73) -TBF(UL:TFI-0-0-2:E:TLLI-0xffeeddce){ASSIGN} N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-2:E:TLLI-0xffeeddce){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-2:E:TLLI-0xffeeddce){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-2:E:TLLI-0xffeeddce){WAIT_ACK}: state_chg to SEND_ASS @@ -9943,7 +9938,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=78 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 78) -TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} N3105 1 => 2 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-1:E:TLLI-0xffeeddcd){WAIT_ACK}: state_chg to SEND_ASS @@ -9997,7 +9991,6 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=82 but previous FN=2654231 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-3:E:TLLI-0xffeeddcf){ASSIGN} TBF(UL:TFI-0-0-3:E:TLLI-0xffeeddcf){ASSIGN} poll timeout for FN=2654231, TS=7 (curr FN 82) -TBF(UL:TFI-0-0-3:E:TLLI-0xffeeddcf){ASSIGN} N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL:TFI-0-0-3:E:TLLI-0xffeeddcf){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(UL:TFI-0-0-3:E:TLLI-0xffeeddcf){ASSIGN} Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| UL_ASS_TBF(UL:TFI-0-0-3:E:TLLI-0xffeeddcf){WAIT_ACK}: state_chg to SEND_ASS -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4d4f4d4d3e6e0539ea8ec2395bed00d059b84e04 Gerrit-Change-Number: 33263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in pysim[master]: 31.102: Fix EF.Routing_Indicator for odd number of digits

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33249 ) Change subject: 31.102: Fix EF.Routing_Indicator for odd number of digits ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6c26dccdd570de7b7a4cd48338068e230340ec7c Gerrit-Change-Number: 33249 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 09 Jun 2023 15:56:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2023