<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26158">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf_ul: Update FSM names for dummy reject TBFs<br><br>This allows easily identifying dummt TBFs created to send assignment<br>rejects.<br><br>Change-Id: I73a197795a9c8e9cd8dc06bf46ddb8f275d2c289<br>---<br>M src/tbf.cpp<br>M src/tbf_ul.cpp<br>M tests/tbf/TbfTest.err<br>3 files changed, 18 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 4b78595..99d1018 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -734,9 +734,10 @@</span><br><span> void tbf_update_state_fsm_name(struct gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> char buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t tfi = (tbf_tfi(tbf) == TBF_TS_UNSET) ? -1 : tbf_tfi(tbf);</span><br><span> snprintf(buf, sizeof(buf), "%s-TFI_%d",</span><br><span> tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF ? "UL" : "DL",</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_tfi(tbf));</span><br><span style="color: hsl(120, 100%, 40%);">+ tfi);</span><br><span> osmo_identifier_sanitize_buf(buf, NULL, '_');</span><br><span> </span><br><span> osmo_fsm_inst_update_id(tbf->state_fsm.fi, buf);</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index ca929ea..f0d16b5 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -221,6 +221,7 @@</span><br><span> talloc_free(ul_tbf);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_update_state_fsm_name(ul_tbf);</span><br><span> </span><br><span> ms_attach_tbf(ms, ul_tbf);</span><br><span> llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)ul_tbf), &trx->ul_tbfs);</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 7d2d534..c440499 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -9078,12 +9078,12 @@</span><br><span> UL_ACK_TBF{NONE}: Allocated</span><br><span> TBF(TFI=-1 TLLI=0xffeeddd3 DIR=UL STATE=NEW) Setting Control TS 7</span><br><span> MS(TLLI=0xffeeddd3, IMSI=, TA=7, 11/11,) Attaching UL TBF: TBF(TFI=-1 TLLI=0xffeeddd3 DIR=UL STATE=NEW)</span><br><span style="color: hsl(0, 100%, 40%);">-TBF{NEW}: Received Event ASSIGN_ADD_PACCH</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_-1){NEW}: Received Event ASSIGN_ADD_PACCH</span><br><span> TBF(TFI=-1 TLLI=0xffeeddd3 DIR=UL STATE=NEW) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span style="color: hsl(0, 100%, 40%);">-TBF{NEW}: state_chg to ASSIGN</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_-1){NEW}: state_chg to ASSIGN</span><br><span> TBF(TFI=-1 TLLI=0xffeeddd3 DIR=UL STATE=ASSIGN) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{NONE}: Received Event SCHED_ASS_REJ</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{NONE}: state_chg to SEND_ASS_REJ</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){NONE}: Received Event SCHED_ASS_REJ</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){NONE}: state_chg to SEND_ASS_REJ</span><br><span> PDCH(bts=0,trx=0,ts=7) Expiring FN=82 but previous FN=2654231 is still reserved!</span><br><span> PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS)</span><br><span> TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 82)</span><br><span>@@ -9109,23 +9109,23 @@</span><br><span> UL_ACK_TBF{NONE}: Allocated</span><br><span> TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=NEW) Setting Control TS 7</span><br><span> MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Attaching UL TBF: TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=NEW)</span><br><span style="color: hsl(0, 100%, 40%);">-TBF{NEW}: Received Event ASSIGN_ADD_PACCH</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_-1){NEW}: Received Event ASSIGN_ADD_PACCH</span><br><span> TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=NEW) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span style="color: hsl(0, 100%, 40%);">-TBF{NEW}: state_chg to ASSIGN</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_-1){NEW}: state_chg to ASSIGN</span><br><span> TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{NONE}: Received Event SCHED_ASS_REJ</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{NONE}: state_chg to SEND_ASS_REJ</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{SEND_ASS_REJ}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{SEND_ASS_REJ}: state_chg to NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){NONE}: Received Event SCHED_ASS_REJ</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){NONE}: state_chg to SEND_ASS_REJ</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){SEND_ASS_REJ}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){SEND_ASS_REJ}: state_chg to NONE</span><br><span> TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) starting timer X2000 [reject (PACCH)] with 0 sec. 0 microsec</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN)</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{NONE}: Timeout of X2000</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){NONE}: Timeout of X2000</span><br><span> TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) free</span><br><span> MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Detaching TBF: TBF(TFI=-1 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN)</span><br><span> MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Destroying MS object</span><br><span> ********** UL-TBF ends here **********</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ACK_TBF{NONE}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-TBF{ASSIGN}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-UL_ASS_TBF{NONE}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-DL_ASS_TBF{NONE}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_-1){NONE}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_-1){ASSIGN}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ASS_TBF(UL-TFI_-1){NONE}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+DL_ASS_TBF(UL-TFI_-1){NONE}: Deallocated</span><br><span> === end test_packet_access_rej_prr_no_other_tbfs ===</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26158">change 26158</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/26158"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I73a197795a9c8e9cd8dc06bf46ddb8f275d2c289 </div>
<div style="display:none"> Gerrit-Change-Number: 26158 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>