<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24469">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stat,rate_ctr: Introduce new API to get counter at given index<br><br>Having this API and forcing apps to use it will allow easily adding new<br>members to the group structure without having so much impact in users of<br>this struct.<br><br>Related: SYS#5456<br>Change-Id: Iebbf401f11e36645f8964d389460918eb9e0910e<br>---<br>M include/osmocom/core/rate_ctr.h<br>M include/osmocom/core/stat_item.h<br>M src/rate_ctr.c<br>M src/stat_item.c<br>4 files changed, 25 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/rate_ctr.h b/include/osmocom/core/rate_ctr.h</span><br><span>index 1669ce4..17ee672 100644</span><br><span>--- a/include/osmocom/core/rate_ctr.h</span><br><span>+++ b/include/osmocom/core/rate_ctr.h</span><br><span>@@ -61,7 +61,7 @@</span><br><span>       const struct rate_ctr_group_desc *desc;</span><br><span>      /*! The index of this ctr_group within its class */</span><br><span>  unsigned int idx;</span><br><span style="color: hsl(0, 100%, 40%);">-       /*! Actual counter structures below */</span><br><span style="color: hsl(120, 100%, 40%);">+        /*! Actual counter structures below. Don't access it directly, use APIs below! */</span><br><span>        struct rate_ctr ctr[0];</span><br><span> };</span><br><span> </span><br><span>@@ -74,6 +74,8 @@</span><br><span>        grp->idx = idx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct rate_ctr *rate_ctr_group_get_ctr(struct rate_ctr_group *grp, unsigned int idx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void rate_ctr_group_free(struct rate_ctr_group *grp);</span><br><span> </span><br><span> /*! Increment the counter by \a inc</span><br><span>@@ -93,7 +95,7 @@</span><br><span>  *  \param idx index into \a ctrg counter group */</span><br><span> static inline void rate_ctr_inc2(struct rate_ctr_group *ctrg, unsigned int idx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     rate_ctr_inc(&ctrg->ctr[idx]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(ctrg, idx));</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/include/osmocom/core/stat_item.h b/include/osmocom/core/stat_item.h</span><br><span>index 29e35ef..3cace08 100644</span><br><span>--- a/include/osmocom/core/stat_item.h</span><br><span>+++ b/include/osmocom/core/stat_item.h</span><br><span>@@ -79,7 +79,7 @@</span><br><span> {</span><br><span>  grp->idx = idx;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_stat_item *osmo_stat_item_group_get_item(struct osmo_stat_item_group *grp, unsigned int idx);</span><br><span> void osmo_stat_item_group_free(struct osmo_stat_item_group *statg);</span><br><span> </span><br><span> void osmo_stat_item_inc(struct osmo_stat_item *item, int32_t value);</span><br><span>diff --git a/src/rate_ctr.c b/src/rate_ctr.c</span><br><span>index 9043a2c..c3a5286 100644</span><br><span>--- a/src/rate_ctr.c</span><br><span>+++ b/src/rate_ctr.c</span><br><span>@@ -263,6 +263,16 @@</span><br><span>    talloc_free(grp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get rate counter from group, identified by index idx</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] grp Rate counter group</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] idx Index of the counter to retrieve</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \returns rate counter requested</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct rate_ctr *rate_ctr_group_get_ctr(struct rate_ctr_group *grp, unsigned int idx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  return &grp->ctr[idx];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Add a number to the counter */</span><br><span> void rate_ctr_add(struct rate_ctr *ctr, int inc)</span><br><span> {</span><br><span>diff --git a/src/stat_item.c b/src/stat_item.c</span><br><span>index 40374a7..a6f86cb 100644</span><br><span>--- a/src/stat_item.c</span><br><span>+++ b/src/stat_item.c</span><br><span>@@ -167,6 +167,16 @@</span><br><span>    talloc_free(grp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get statistics item from group, identified by index idx</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] grp Rate counter group</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] idx Index of the counter to retrieve</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \returns rate counter requested</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_stat_item *osmo_stat_item_group_get_item(struct osmo_stat_item_group *grp, unsigned int idx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    return grp->items[idx];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Increase the stat_item to the given value.</span><br><span>  *  This function adds a new value for the given stat_item at the end of</span><br><span>  *  the FIFO.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24469">change 24469</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/libosmocore/+/24469"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iebbf401f11e36645f8964d389460918eb9e0910e </div>
<div style="display:none"> Gerrit-Change-Number: 24469 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </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>