<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25206">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: send real last value if no new values come<br><br>Fixes: OS#5215<br>Change-Id: Ibeefd0e3d1dbe4be454ff05a21df4848b2abfabe<br>---<br>M include/osmocom/core/stat_item.h<br>M src/stats.c<br>M tests/stats/stats_test.c<br>M tests/stats/stats_test.err<br>4 files changed, 14 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/25206/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/stat_item.h b/include/osmocom/core/stat_item.h</span><br><span>index fbe0433..f4f85cf 100644</span><br><span>--- a/include/osmocom/core/stat_item.h</span><br><span>+++ b/include/osmocom/core/stat_item.h</span><br><span>@@ -32,6 +32,10 @@</span><br><span>      int16_t last_offs;</span><br><span>   /*! value FIFO */</span><br><span>    struct osmo_stat_item_value values[0];</span><br><span style="color: hsl(120, 100%, 40%);">+        /* internal use by stats API: indicate if the last value sent to</span><br><span style="color: hsl(120, 100%, 40%);">+       * reporters was actually the last value in the FIFO. This may not be</span><br><span style="color: hsl(120, 100%, 40%);">+  * the case, as always a max of 1 or more values gets sent (OS#5215) */</span><br><span style="color: hsl(120, 100%, 40%);">+       bool stats_last_sent_was_max;</span><br><span> };</span><br><span> </span><br><span> /*! Statistics item description */</span><br><span>diff --git a/src/stats.c b/src/stats.c</span><br><span>index 411ecff..f06515d 100644</span><br><span>--- a/src/stats.c</span><br><span>+++ b/src/stats.c</span><br><span>@@ -715,6 +715,11 @@</span><br><span>        if (!have_value) {</span><br><span>           /* Send the last value in case a flush is requested */</span><br><span>               value = osmo_stat_item_get_last(item);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+              /* Also send it in case a different max value was sent</span><br><span style="color: hsl(120, 100%, 40%);">+                 * previously (OS#5215) */</span><br><span style="color: hsl(120, 100%, 40%);">+            if (!item->stats_last_sent_was_max)</span><br><span style="color: hsl(120, 100%, 40%);">+                        have_value = 1;</span><br><span>      } else {</span><br><span>             int32_t next_val;</span><br><span>            /* If we have multiple values only send the max */</span><br><span>@@ -722,6 +727,8 @@</span><br><span>                     value = OSMO_MAX(value, next_val);</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ item->stats_last_sent_was_max = (osmo_stat_item_get_last(item) == value);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       llist_for_each_entry(srep, &osmo_stats_reporter_list, list) {</span><br><span>            if (!srep->running)</span><br><span>                       continue;</span><br><span>diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c</span><br><span>index 6702131..168b8ad 100644</span><br><span>--- a/tests/stats/stats_test.c</span><br><span>+++ b/tests/stats/stats_test.c</span><br><span>@@ -445,7 +445,7 @@</span><br><span>         fprintf(stderr, "report (group 1, no update, send last item (!= last max), OS#5215):\n");</span><br><span>  send_count = 0;</span><br><span>      osmo_stats_report();</span><br><span style="color: hsl(0, 100%, 40%);">-    OSMO_ASSERT(send_count == 0); /* BUG: should be 2! */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(send_count == 2);</span><br><span> </span><br><span>    fprintf(stderr, "report (group 1, no update, nothing to send):\n");</span><br><span>        send_count = 0;</span><br><span>diff --git a/tests/stats/stats_test.err b/tests/stats/stats_test.err</span><br><span>index f76783c..6590c8b 100644</span><br><span>--- a/tests/stats/stats_test.err</span><br><span>+++ b/tests/stats/stats_test.err</span><br><span>@@ -116,6 +116,8 @@</span><br><span>   test2: item p= g=test.one i=1 n=item.a v=20 u=ma</span><br><span>   test1: item p= g=test.one i=1 n=item.a v=20 u=ma</span><br><span> report (group 1, no update, send last item (!= last max), OS#5215):</span><br><span style="color: hsl(120, 100%, 40%);">+  test2: item p= g=test.one i=1 n=item.a v=10 u=ma</span><br><span style="color: hsl(120, 100%, 40%);">+  test1: item p= g=test.one i=1 n=item.a v=10 u=ma</span><br><span> report (group 1, no update, nothing to send):</span><br><span> report (remove statg1, ctrg1):</span><br><span>   test2: counter p= g=ctr-test:one_dot i=3 n=ctr:a v=0 d=0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25206">change 25206</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/+/25206"/><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: Ibeefd0e3d1dbe4be454ff05a21df4848b2abfabe </div>
<div style="display:none"> Gerrit-Change-Number: 25206 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>