<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25034">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: 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>4 files changed, 24 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/34/25034/1</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 1c777a7..3322857 100644</span><br><span>--- a/src/tbf_fsm.c</span><br><span>+++ b/src/tbf_fsm.c</span><br><span>@@ -47,6 +47,8 @@</span><br><span> //{ TBF_EV_ASSIGN_DEL_PACCH, "ASSIGN_DEL_PACCH" },</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>@@ -138,6 +140,20 @@</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%);">+ //struct tbf_fsm_ctx *ctx = (struct tbf_fsm_ctx *)fi->priv;</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>@@ -182,14 +198,15 @@</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> //.onenter = st_flow_on_enter,</span><br><span style="color: hsl(0, 100%, 40%);">- //.action = st_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 405f5c6..f4f5ad7 100644</span><br><span>--- a/src/tbf_fsm.h</span><br><span>+++ b/src/tbf_fsm.h</span><br><span>@@ -33,6 +33,8 @@</span><br><span> //TBF_EV_ASSIGN_DEL_PACCH,</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 4b3d015..54108ed 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -534,7 +534,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></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: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>