<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19061">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fixup for Osmocom_CTRL_Functions: rate counters in bulk<br><br>At the time of writing Ief0d9b096feeee7d37b5f2429dd3e80de0161806 I wasn't aware<br>of the 'inout' keyword, which allows to pass the counter list by reference.<br><br>Rather modify the counter lists in-place. Instead of requiring<br><br>  list := f_counter_name_vals_add(list, ...)<br><br>rather implement by directly modifying list:<br><br>  f_counter_name_vals_add(list, ...)<br><br>Change-Id: I85ac56b042fe4bb1db392c1f451c8e900582cc2a<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/Osmocom_CTRL_Functions.ttcn<br>2 files changed, 7 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/19061/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index facb001..f25c75d 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -197,7 +197,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_ctrs_msc_add(integer msc_nr, charstring countername, integer val := 1) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-   g_ctr_msc := f_counter_name_vals_list_add(g_ctr_msc, msc_nr, countername, val);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_counter_name_vals_list_add(g_ctr_msc, msc_nr, countername, val);</span><br><span> }</span><br><span> </span><br><span> /*  f_ctrs_msc_init();</span><br><span>diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn</span><br><span>index ee7025c..60c66c0 100644</span><br><span>--- a/library/Osmocom_CTRL_Functions.ttcn</span><br><span>+++ b/library/Osmocom_CTRL_Functions.ttcn</span><br><span>@@ -222,12 +222,12 @@</span><br><span>       }</span><br><span> </span><br><span>        /* In a list of one instance's counters, increment a specifically named counter. */</span><br><span style="color: hsl(0, 100%, 40%);">- function f_counter_name_vals_add(CounterNameVals vals, charstring countername, integer val := 1)</span><br><span style="color: hsl(0, 100%, 40%);">-        return CounterNameVals{</span><br><span style="color: hsl(120, 100%, 40%);">+       function f_counter_name_vals_add(inout CounterNameVals vals, charstring countername, integer val := 1)</span><br><span style="color: hsl(120, 100%, 40%);">+        {</span><br><span>            for (var integer i := 0; i < lengthof(vals); i := i + 1) {</span><br><span>                        if (vals[i].name == countername) {</span><br><span>                           vals[i].val := vals[i].val + val;</span><br><span style="color: hsl(0, 100%, 40%);">-                               return vals;</span><br><span style="color: hsl(120, 100%, 40%);">+                          return;</span><br><span>                      }</span><br><span>            }</span><br><span>            /* name not found, append */</span><br><span>@@ -235,15 +235,13 @@</span><br><span>                         name := countername,</span><br><span>                         val := val</span><br><span>           }</span><br><span style="color: hsl(0, 100%, 40%);">-               return vals;</span><br><span>         }</span><br><span> </span><br><span>        /* In a list of several instances' counters, increment a specific instance's specifically named counter. */</span><br><span style="color: hsl(0, 100%, 40%);">-     function f_counter_name_vals_list_add(CounterNameValsList vals, integer instance_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+  function f_counter_name_vals_list_add(inout CounterNameValsList vals, integer instance_nr,</span><br><span>                                         charstring countername, integer val := 1)</span><br><span style="color: hsl(0, 100%, 40%);">- return CounterNameValsList {</span><br><span style="color: hsl(0, 100%, 40%);">-            vals[instance_nr] := f_counter_name_vals_add(vals[instance_nr], countername, val);</span><br><span style="color: hsl(0, 100%, 40%);">-              return vals;</span><br><span style="color: hsl(120, 100%, 40%);">+  {</span><br><span style="color: hsl(120, 100%, 40%);">+             f_counter_name_vals_add(vals[instance_nr], countername, val);</span><br><span>        }</span><br><span> </span><br><span>        /* For a specific instance, call f_counter_name_vals_get() and compare with expected counter values.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19061">change 19061</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-ttcn3-hacks/+/19061"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I85ac56b042fe4bb1db392c1f451c8e900582cc2a </div>
<div style="display:none"> Gerrit-Change-Number: 19061 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>