<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23509">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats_test: restore stat_item_get_next asserts<br><br>This is a partial revert of b27b352e ("stats: Use a global index for<br>stat item values"). Now that osmo_stat_item_get_next correctly returns<br>how many values have been skipped, we can use the accurate asserts on<br>its return value again.<br><br>Fix the initial values of next_id_a,b (1 instead of 0), so we don't get<br>a skipped value on the first read. This is needed, because b27b352e<br>refactored osmo_stat_item_get_next to have the next id as parameter<br>instead of the last read one, and the initial value was not adjusted in<br>the tests.<br><br>Related: OS#5088<br>Change-Id: I9d4cda2487a62f52361c24058363dfa90e502c63<br>---<br>M tests/stats/stats_test.c<br>1 file changed, 18 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c</span><br><span>index b6b4be9..1d53aaa 100644</span><br><span>--- a/tests/stats/stats_test.c</span><br><span>+++ b/tests/stats/stats_test.c</span><br><span>@@ -90,8 +90,8 @@</span><br><span> const struct osmo_stat_item *sitem1, *sitem2;</span><br><span> int rc;</span><br><span> int32_t value;</span><br><span style="color: hsl(0, 100%, 40%);">- int32_t next_id_a = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int32_t next_id_b = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t next_id_a = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t next_id_b = 1;</span><br><span> int i;</span><br><span> </span><br><span> OSMO_ASSERT(statg != NULL);</span><br><span>@@ -129,7 +129,7 @@</span><br><span> OSMO_ASSERT(value == 1);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 1);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span>@@ -140,28 +140,28 @@</span><br><span> osmo_stat_item_set(statg->items[TEST_B_ITEM], 1000 + i);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == i);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_B_ITEM], &next_id_b, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 1000 + i);</span><br><span> }</span><br><span> </span><br><span> /* check if dec & inc is working */</span><br><span> osmo_stat_item_set(statg->items[TEST_A_ITEM], 42);</span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 42);</span><br><span> </span><br><span> osmo_stat_item_dec(statg->items[TEST_A_ITEM], 21);</span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 21);</span><br><span> </span><br><span> osmo_stat_item_inc(statg->items[TEST_A_ITEM], 21);</span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 42);</span><br><span> </span><br><span> /* Keep 2 in FIFO */</span><br><span>@@ -173,20 +173,20 @@</span><br><span> osmo_stat_item_set(statg->items[TEST_B_ITEM], 1000 + i);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == i-1);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_B_ITEM], &next_id_b, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 1000 + i-1);</span><br><span> }</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 64);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_B_ITEM], &next_id_b, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 1000 + 64);</span><br><span> </span><br><span> /* Overrun FIFOs */</span><br><span>@@ -196,29 +196,29 @@</span><br><span> }</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 93 - 65 + 1);</span><br><span> OSMO_ASSERT(value == 93);</span><br><span> </span><br><span> for (i = 94; i <= 96; i++) {</span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == i);</span><br><span> }</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_B_ITEM], &next_id_b, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 90 - 65 + 1);</span><br><span> OSMO_ASSERT(value == 1000 + 90);</span><br><span> </span><br><span> for (i = 91; i <= 96; i++) {</span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_B_ITEM], &next_id_b, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 1000 + i);</span><br><span> }</span><br><span> </span><br><span> /* Test Discard (single item) */</span><br><span> osmo_stat_item_set(statg->items[TEST_A_ITEM], 97);</span><br><span> rc = osmo_stat_item_discard(statg->items[TEST_A_ITEM], &next_id_a);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> </span><br><span> rc = osmo_stat_item_discard(statg->items[TEST_A_ITEM], &next_id_a);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span>@@ -228,7 +228,7 @@</span><br><span> </span><br><span> osmo_stat_item_set(statg->items[TEST_A_ITEM], 98);</span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(rc > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 1);</span><br><span> OSMO_ASSERT(value == 98);</span><br><span> </span><br><span> rc = osmo_stat_item_get_next(statg->items[TEST_A_ITEM], &next_id_a, &value);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23509">change 23509</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/+/23509"/><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: I9d4cda2487a62f52361c24058363dfa90e502c63 </div>
<div style="display:none"> Gerrit-Change-Number: 23509 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>