<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25034">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move FINISHED tbf_state transition to tbf_fsm<br><br>Related: OS#2709<br>Change-Id: I81f507e3a2821254f03364a58ead02333e63099f<br>---<br>M src/tbf_dl.cpp<br>M src/tbf_fsm.c<br>M src/tbf_fsm.h<br>M src/tbf_ul.cpp<br>M tests/tbf/TbfTest.err<br>5 files changed, 30 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 12fd99f..ed5003c 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -711,7 +711,7 @@</span><br><span> is_final = llc_queue_size(llc_queue()) == 0 && !keep_open(fn);</span><br><span> if (is_final) {</span><br><span> rdbi->cv = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- TBF_SET_STATE(this, TBF_ST_FINISHED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_LAST_DL_DATA_SENT, NULL);</span><br><span> }</span><br><span> </span><br><span> if (mcs_is_edge(cs)) {</span><br><span>@@ -756,7 +756,7 @@</span><br><span> </span><br><span> if (is_final) {</span><br><span> request_dl_ack();</span><br><span style="color: hsl(0, 100%, 40%);">- TBF_SET_STATE(this, TBF_ST_FINISHED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_LAST_DL_DATA_SENT, NULL);</span><br><span> }</span><br><span> </span><br><span> /* dequeue next LLC frame, if any */</span><br><span>diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c</span><br><span>index 5799d90..8e0649d 100644</span><br><span>--- a/src/tbf_fsm.c</span><br><span>+++ b/src/tbf_fsm.c</span><br><span>@@ -46,6 +46,8 @@</span><br><span> { TBF_EV_ASSIGN_DEL_CCCH, "ASSIGN_DEL_CCCH" },</span><br><span> { TBF_EV_ASSIGN_ACK_PACCH, "ASSIGN_ACK_PACCH" },</span><br><span> { TBF_EV_ASSIGN_READY_CCCH, "ASSIGN_READY_CCCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TBF_EV_LAST_DL_DATA_SENT, "LAST_DL_DATA_SENT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TBF_EV_LAST_UL_DATA_RECVD, "LAST_UL_DATA_RECVD" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -137,6 +139,19 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void st_flow(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TBF_EV_LAST_DL_DATA_SENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case TBF_EV_LAST_UL_DATA_RECVD:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* All data has been sent or received, change state to FINISHED */</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_fsm_state_chg(fi, TBF_ST_FINISHED);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void tbf_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause)</span><br><span> {</span><br><span> /* TODO: needed ?</span><br><span>@@ -180,12 +195,14 @@</span><br><span> },</span><br><span> [TBF_ST_FLOW] = {</span><br><span> .in_event_mask =</span><br><span style="color: hsl(0, 100%, 40%);">- 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(TBF_EV_LAST_DL_DATA_SENT) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(TBF_EV_LAST_UL_DATA_RECVD),</span><br><span> .out_state_mask =</span><br><span> X(TBF_ST_FINISHED) |</span><br><span> X(TBF_ST_WAIT_RELEASE) |</span><br><span> X(TBF_ST_RELEASING),</span><br><span> .name = "FLOW",</span><br><span style="color: hsl(120, 100%, 40%);">+ .action = st_flow,</span><br><span> },</span><br><span> [TBF_ST_FINISHED] = {</span><br><span> .in_event_mask =</span><br><span>diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h</span><br><span>index a3050c0..ea0f58d 100644</span><br><span>--- a/src/tbf_fsm.h</span><br><span>+++ b/src/tbf_fsm.h</span><br><span>@@ -32,6 +32,8 @@</span><br><span> TBF_EV_ASSIGN_DEL_CCCH, /* An assignment previously sent over CCCH has been confirmed by MS */</span><br><span> TBF_EV_ASSIGN_ACK_PACCH, /* We received a CTRL ACK confirming assignment started on PACCH */</span><br><span> TBF_EV_ASSIGN_READY_CCCH, /* TBF Start Time timer triggered */</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_EV_LAST_DL_DATA_SENT, /* DL TBF sends RLCMAC block containing last DL avilable data buffered */</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_EV_LAST_UL_DATA_RECVD, /* UL TBF sends RLCMAC block containing last UL data (cv=0) */</span><br><span> };</span><br><span> </span><br><span> enum tbf_fsm_states {</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 2874fc6..3eec555 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -536,7 +536,7 @@</span><br><span> rdbi->bsn, rdbi->cv);</span><br><span> if (rdbi->cv == 0) {</span><br><span> LOGPTBFUL(this, LOGL_DEBUG, "Finished with UL TBF\n");</span><br><span style="color: hsl(0, 100%, 40%);">- TBF_SET_STATE(this, TBF_ST_FINISHED);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_LAST_UL_DATA_RECVD, NULL);</span><br><span> /* Reset N3103 counter. */</span><br><span> this->n_reset(N3103);</span><br><span> }</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 84735aa..ccfd459 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -483,6 +483,7 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Empty chunk, added LLC dummy command of size 19, drained_since=112</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Keep idle TBF open: 112/43 -> no</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Complete DL frame, len=19</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(DL-TFI_0){FLOW}: Received Event LAST_DL_DATA_SENT</span><br><span> TBF(DL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) data block (BSN 21, CS-1): 4d 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 21 BSN2 -1)</span><br><span>@@ -1597,6 +1598,7 @@</span><br><span> TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FLOW) downlink (V(A)==0 .. V(S)==2) mcs_mode_restrict=EGPRS</span><br><span> TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FLOW) Sending new block at BSN 2, CS=CS-1</span><br><span> TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FLOW) Complete DL frame, len=19</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(DL-TFI_0){FLOW}: Received Event LAST_DL_DATA_SENT</span><br><span> TBF(DL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) data block (BSN 2, CS-1): 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 </span><br><span> TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1)</span><br><span>@@ -1649,6 +1651,7 @@</span><br><span> No bctx</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) No gaps in received block, last block: BSN=0 CV=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Finished with UL TBF</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_0){FLOW}: Received Event LAST_UL_DATA_RECVD</span><br><span> TBF(UL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling Ack/Nack, because TLLI is included.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling final Ack/Nack, because all data was received and last block has CV==0.</span><br><span>@@ -1889,6 +1892,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Sending new block at BSN 0, CS=CS-4</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Dequeue next LLC (len=10)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Complete DL frame, len=10</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(DL-TFI_0){FLOW}: Received Event LAST_DL_DATA_SENT</span><br><span> TBF(DL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) data block (BSN 0, CS-4): 29 52 41 55 5f 41 43 43 45 50 54 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1)</span><br><span>@@ -2308,6 +2312,7 @@</span><br><span> No bctx</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) No gaps in received block, last block: BSN=0 CV=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Finished with UL TBF</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(UL-TFI_0){FLOW}: Received Event LAST_UL_DATA_RECVD</span><br><span> TBF(UL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling Ack/Nack, because TLLI is included.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling final Ack/Nack, because all data was received and last block has CV==0.</span><br><span>@@ -2988,6 +2993,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Complete DL frame, len=13</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Dequeue next LLC (len=13)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Complete DL frame, len=13</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(DL-TFI_0){FLOW}: Received Event LAST_DL_DATA_SENT</span><br><span> TBF(DL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) data block (BSN 27, CS-1): 16 35 45 54 20 33 38 4c 4c 43 20 50 41 43 4b 45 54 20 33 39 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 27 BSN2 -1)</span><br><span>@@ -3332,6 +3338,7 @@</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FLOW) downlink (V(A)==0 .. V(S)==10) mcs_mode_restrict=EGPRS</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FLOW) Sending new block at BSN 10, CS=CS-1</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FLOW) Complete DL frame, len=21</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(DL-TFI_1){FLOW}: Received Event LAST_DL_DATA_SENT</span><br><span> TBF(DL-TFI_1){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) data block (BSN 10, CS-1): 4d 43 20 50 41 43 4b 45 54 20 30 39 20 28 54 42 46 20 32 29 </span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25034">change 25034</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/+/25034"/><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: I81f507e3a2821254f03364a58ead02333e63099f </div>
<div style="display:none"> Gerrit-Change-Number: 25034 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>