<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25054">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;">Get rid of tbf_dl:abort()<br><br>Having that code in a separate function is confusing and adds code<br>complexity since it looks like an entry point to start feeing a TBF, but<br>it simply some (not yet really useful) set of instructions to be called<br>one 1 code path in tbf_free.<br>Let's move it there, this way it becomes clear tbf_free() is THE place<br>to be (if you want to get rid of a TBF).<br><br>Change-Id: I30febf4d21a0bfab37524c07598bbb0dd32f7f65<br>---<br>M src/tbf.cpp<br>M src/tbf_dl.cpp<br>M src/tbf_dl.h<br>3 files changed, 15 insertions(+), 29 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 16a53cc..097f002 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -275,10 +275,23 @@</span><br><span> bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_UL_ABORTED);</span><br><span> } else {</span><br><span> gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_rlc_dl_window *win = static_cast<gprs_rlc_dl_window *>(dl_tbf->window());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_DL_FREED);</span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf->state_is(TBF_ST_FLOW))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_is(TBF_ST_FLOW)) {</span><br><span> bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_DL_ABORTED);</span><br><span style="color: hsl(0, 100%, 40%);">- dl_tbf->abort();</span><br><span style="color: hsl(120, 100%, 40%);">+ /* range V(A)..V(S)-1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t lost = win->count_unacked();</span><br><span style="color: hsl(120, 100%, 40%);">+ /* report all outstanding packets as lost */</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_rlcmac_received_lost(dl_tbf, 0, lost);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Reschedule all LLC frames starting with the one that is</span><br><span style="color: hsl(120, 100%, 40%);">+ * (partly) encoded in chunk 1 of block V(A). (optional) */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This state change looks unneeded and can probably be dropped at some point: */</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_fsm_state_chg(dl_tbf->state_fsm.fi, TBF_ST_RELEASING);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset rlc states */</span><br><span style="color: hsl(120, 100%, 40%);">+ win->reset();</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(dl_tbf->state_fsm.fi, TBF_EV_ASSIGN_DEL_CCCH, NULL);</span><br><span> }</span><br><span> </span><br><span> LOGPTBF(tbf, LOGL_INFO, "free\n");</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 0330a78..9e06917 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -1261,32 +1261,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gprs_rlcmac_dl_tbf::abort()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t lost;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (state_is(TBF_ST_FLOW)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* range V(A)..V(S)-1 */</span><br><span style="color: hsl(0, 100%, 40%);">- lost = m_window.count_unacked();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* report all outstanding packets as lost */</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_received_lost(this, 0, lost);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: Reschedule all LLC frames starting with the one that is</span><br><span style="color: hsl(0, 100%, 40%);">- * (partly) encoded in chunk 1 of block V(A). (optional) */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* This state change looks unneeded and can probably be dropped at some point: */</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_fsm_state_chg(this->state_fsm.fi, TBF_ST_RELEASING);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* reset rlc states */</span><br><span style="color: hsl(0, 100%, 40%);">- m_window.reset();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_ASSIGN_DEL_CCCH, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int gprs_rlcmac_dl_tbf::rcvd_dl_ack(bool final_ack, unsigned first_bsn,</span><br><span> struct bitvec *rbb)</span><br><span> {</span><br><span>diff --git a/src/tbf_dl.h b/src/tbf_dl.h</span><br><span>index 6fddeb5..b8fecde 100644</span><br><span>--- a/src/tbf_dl.h</span><br><span>+++ b/src/tbf_dl.h</span><br><span>@@ -61,7 +61,6 @@</span><br><span> int frames_since_last_drain(unsigned fn) const;</span><br><span> bool keep_open(unsigned fn) const;</span><br><span> int release();</span><br><span style="color: hsl(0, 100%, 40%);">- int abort();</span><br><span> uint16_t window_size() const;</span><br><span> void set_window_size();</span><br><span> void update_coding_scheme_counter_dl(enum CodingScheme cs);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25054">change 25054</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/+/25054"/><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: I30febf4d21a0bfab37524c07598bbb0dd32f7f65 </div>
<div style="display:none"> Gerrit-Change-Number: 25054 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>