<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25050">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Put dl_tbf::cleanup into destructor<br><br>It's fine to always attemt dropping the timer since it's set up in the<br>constructor.<br>This also drps the double function call abort()+cleanup() which is<br>confusing.<br><br>Change-Id: Ia2aaa43bd8faacf09fe4b36b11b38022bea7a59c<br>---<br>M src/tbf.cpp<br>M src/tbf_dl.cpp<br>M src/tbf_dl.h<br>3 files changed, 7 insertions(+), 7 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/50/25050/1</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 2529eaa..579a46d 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -293,7 +293,6 @@</span><br><span>                 gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf);</span><br><span> </span><br><span>             dl_tbf->abort();</span><br><span style="color: hsl(0, 100%, 40%);">-             dl_tbf->cleanup();</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 f264cfc..2154ed6 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -177,6 +177,12 @@</span><br><span>     return tbf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+gprs_rlcmac_dl_tbf::~gprs_rlcmac_dl_tbf()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_timer_del(&m_llc_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+     /* ~gprs_rlcmac_dl_tbf() is called automatically upon return */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(struct gprs_rlcmac_bts *bts_, GprsMs *ms) :</span><br><span>   gprs_rlcmac_tbf(bts_, ms, GPRS_RLCMAC_DL_TBF),</span><br><span>       m_tx_counter(0),</span><br><span>@@ -191,11 +197,6 @@</span><br><span>      osmo_timer_setup(&m_llc_timer, llc_timer_cb, this);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void gprs_rlcmac_dl_tbf::cleanup()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     osmo_timer_del(&m_llc_timer);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void gprs_rlcmac_dl_tbf::start_llc_timer()</span><br><span> {</span><br><span>        if (the_pcu->vty.llc_idle_ack_csec > 0) {</span><br><span>diff --git a/src/tbf_dl.h b/src/tbf_dl.h</span><br><span>index af82a0c..6fddeb5 100644</span><br><span>--- a/src/tbf_dl.h</span><br><span>+++ b/src/tbf_dl.h</span><br><span>@@ -42,8 +42,8 @@</span><br><span> </span><br><span> struct gprs_rlcmac_dl_tbf : public gprs_rlcmac_tbf {</span><br><span>         gprs_rlcmac_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms);</span><br><span style="color: hsl(120, 100%, 40%);">+  ~gprs_rlcmac_dl_tbf();</span><br><span>       gprs_rlc_window *window();</span><br><span style="color: hsl(0, 100%, 40%);">-      void cleanup();</span><br><span> </span><br><span>  int append_data(uint16_t pdu_delay_csec,</span><br><span>                     const uint8_t *data, uint16_t len);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25050">change 25050</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/+/25050"/><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: Ia2aaa43bd8faacf09fe4b36b11b38022bea7a59c </div>
<div style="display:none"> Gerrit-Change-Number: 25050 </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>