<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18227">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  neels: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Drop specific functions to add values to counters<br><br>It's super annoying seeing lots of functions being called everywhere<br>only to find out they are only incrementing a counter. Let's drop all<br>those functions and increment the counter so people looking at code<br>doesn't see dozens of code paths evyerwhere.<br><br>Most of the commit was generated by following sh snippet:<br>"""<br> #!/bin/bash<br>define_pattern="^CREATE_COUNT_ADD_INLINE"<br>generic_func="do_rate_ctr_add"<br>grep -r -l "${define_pattern}" . | xargs cat | grep "${define_pattern}("| tr -d ",;" | tr "()" " " | awk '{ print $2 " " $3 }' >/tmp/hello<br><br>while read -r func_name ctr_name<br>do<br> #echo "$func_name -> $ctr_name";<br>files="$(grep -r -l "${func_name}(" .)"<br>for f in $files; do<br>echo "$f: $func_name -> $ctr_name";<br>sed -i "s#${func_name}(#${generic_func}(${ctr_name}, #g" $f<br>done;<br>done < /tmp/hello<br><br>grep -r -l "void ${generic_func}" | xargs sed -i "/void ${generic_func}(CTR/d"<br>grep -r -l "$define_pattern" | xargs sed -i "/$define_pattern/d"<br>"""<br><br>Change-Id: I966221d6f9fb9bb4f6068bf45ca2978008a0efed<br>---<br>M src/bts.h<br>M src/gprs_rlcmac_sched.cpp<br>M src/pdch.cpp<br>M src/tbf_dl.cpp<br>M src/tbf_ul.cpp<br>5 files changed, 10 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 471ac2e..5090f58 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -320,12 +320,6 @@</span><br><span>        /*</span><br><span>    * Statistics</span><br><span>         */</span><br><span style="color: hsl(0, 100%, 40%);">-     void rlc_dl_bytes(int bytes);</span><br><span style="color: hsl(0, 100%, 40%);">-   void rlc_dl_payload_bytes(int bytes);</span><br><span style="color: hsl(0, 100%, 40%);">-   void rlc_ul_bytes(int bytes);</span><br><span style="color: hsl(0, 100%, 40%);">-   void rlc_ul_payload_bytes(int bytes);</span><br><span style="color: hsl(0, 100%, 40%);">-   void llc_dl_bytes(int bytes);</span><br><span style="color: hsl(0, 100%, 40%);">-   void llc_ul_bytes(int bytes);</span><br><span> </span><br><span>    void ms_present(int32_t n);</span><br><span>  int32_t ms_present_get();</span><br><span>@@ -336,6 +330,7 @@</span><br><span>      struct rate_ctr_group *rate_counters() const;</span><br><span>        struct osmo_stat_item_group *stat_items() const;</span><br><span>     void do_rate_ctr_inc(unsigned int ctr_id);</span><br><span style="color: hsl(120, 100%, 40%);">+    void do_rate_ctr_add(unsigned int ctr_id, int inc);</span><br><span> </span><br><span>      LListHead<gprs_rlcmac_tbf>& ul_tbfs();</span><br><span>     LListHead<gprs_rlcmac_tbf>& dl_tbfs();</span><br><span>@@ -409,17 +404,10 @@</span><br><span>     rate_ctr_inc(&m_ratectrs->ctr[ctr_id]);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define CREATE_COUNT_ADD_INLINE(func_name, ctr_name) \</span><br><span style="color: hsl(0, 100%, 40%);">-   inline void BTS::func_name(int inc) {\</span><br><span style="color: hsl(0, 100%, 40%);">-          rate_ctr_add(&m_ratectrs->ctr[ctr_name], inc); \</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+inline void BTS::do_rate_ctr_add(unsigned int ctr_id, int inc) {</span><br><span style="color: hsl(120, 100%, 40%);">+   rate_ctr_add(&m_ratectrs->ctr[ctr_id], inc);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CREATE_COUNT_ADD_INLINE(rlc_dl_bytes, CTR_RLC_DL_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">-CREATE_COUNT_ADD_INLINE(rlc_dl_payload_bytes, CTR_RLC_DL_PAYLOAD_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">-CREATE_COUNT_ADD_INLINE(rlc_ul_bytes, CTR_RLC_UL_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">-CREATE_COUNT_ADD_INLINE(rlc_ul_payload_bytes, CTR_RLC_UL_PAYLOAD_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">-CREATE_COUNT_ADD_INLINE(llc_dl_bytes, CTR_LLC_DL_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">-CREATE_COUNT_ADD_INLINE(llc_ul_bytes, CTR_LLC_UL_BYTES);</span><br><span> </span><br><span> #define CREATE_STAT_INLINE(func_name, func_name_get, stat_name) \</span><br><span>  inline void BTS::func_name(int32_t val) {\</span><br><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 6a53468..3db3365 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -444,7 +444,7 @@</span><br><span>    if (!msg)</span><br><span>            return -ENOMEM;</span><br><span>      /* msg is now available */</span><br><span style="color: hsl(0, 100%, 40%);">-      bts->bts->rlc_dl_bytes(msg->data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+       bts->bts->do_rate_ctr_add(CTR_RLC_DL_BYTES, msg->data_len);</span><br><span> </span><br><span>     /* set USF */</span><br><span>        OSMO_ASSERT(msgb_length(msg) > 0);</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 202f642..fb02d59 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -759,7 +759,7 @@</span><br><span>             return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bts()->rlc_ul_bytes(len);</span><br><span style="color: hsl(120, 100%, 40%);">+  bts()->do_rate_ctr_add(CTR_RLC_UL_BYTES, len);</span><br><span> </span><br><span>        LOGP(DRLCMACUL, LOGL_DEBUG, "Got RLC block, coding scheme: %s, "</span><br><span>           "length: %d (%d))\n", mcs_name(cs), len, cs.usedSizeUL());</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 5197717..dab1e29 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -630,14 +630,14 @@</span><br><span>                    &m_llc, &write_offset, &num_chunks, data, is_final, &payload_written);</span><br><span> </span><br><span>           if (payload_written > 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                     bts->rlc_dl_payload_bytes(payload_written);</span><br><span style="color: hsl(120, 100%, 40%);">+                        bts->do_rate_ctr_add(CTR_RLC_DL_PAYLOAD_BYTES, payload_written);</span><br><span> </span><br><span>              if (ar == Encoding::AR_NEED_MORE_BLOCKS)</span><br><span>                     break;</span><br><span> </span><br><span>           LOGPTBFDL(this, LOGL_DEBUG, "Complete DL frame, len=%d\n", m_llc.frame_length());</span><br><span>          gprs_rlcmac_dl_bw(this, m_llc.frame_length());</span><br><span style="color: hsl(0, 100%, 40%);">-          bts->llc_dl_bytes(m_llc.frame_length());</span><br><span style="color: hsl(120, 100%, 40%);">+           bts->do_rate_ctr_add(CTR_LLC_DL_BYTES, m_llc.frame_length());</span><br><span>             m_llc.reset();</span><br><span> </span><br><span>           if (is_final) {</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 90cbf8d..fee9919 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -92,7 +92,7 @@</span><br><span>             frame = frames + i;</span><br><span> </span><br><span>              if (frame->length) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 bts->rlc_ul_payload_bytes(frame->length);</span><br><span style="color: hsl(120, 100%, 40%);">+                       bts->do_rate_ctr_add(CTR_RLC_UL_PAYLOAD_BYTES, frame->length);</span><br><span> </span><br><span>                     LOGPTBFUL(this, LOGL_DEBUG, "Frame %d "</span><br><span>                            "starts at offset %d, "</span><br><span>@@ -108,7 +108,7 @@</span><br><span>                      /* send frame to SGSN */</span><br><span>                     LOGPTBFUL(this, LOGL_DEBUG, "complete UL frame len=%d\n", m_llc.frame_length());</span><br><span>                   snd_ul_ud();</span><br><span style="color: hsl(0, 100%, 40%);">-                    bts->llc_ul_bytes(m_llc.frame_length());</span><br><span style="color: hsl(120, 100%, 40%);">+                   bts->do_rate_ctr_add(CTR_LLC_UL_BYTES, m_llc.frame_length());</span><br><span>                     m_llc.reset();</span><br><span>               }</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18227">change 18227</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/+/18227"/><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: I966221d6f9fb9bb4f6068bf45ca2978008a0efed </div>
<div style="display:none"> Gerrit-Change-Number: 18227 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>