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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer<br><br>gettimeofday can jump and the comment says it should not be used for elapsed timer.<br><br>Related: OS#4997<br>Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index 66ee450..88ce8ae 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -70,7 +70,7 @@</span><br><span>           struct osmo_timer_list timer;</span><br><span>                enum ns2_timeout mode;</span><br><span>               int N;</span><br><span style="color: hsl(0, 100%, 40%);">-          struct timeval timer_started;</span><br><span style="color: hsl(120, 100%, 40%);">+         struct timespec timer_started;</span><br><span>       } alive;</span><br><span> };</span><br><span> </span><br><span>@@ -155,7 +155,7 @@</span><br><span>     priv->alive.mode = NS_TOUT_TNS_ALIVE;</span><br><span>     priv->alive.N = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_gettimeofday(&priv->alive.timer_started, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started);</span><br><span>      ns2_tx_alive(priv->nsvc);</span><br><span>         osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);</span><br><span> }</span><br><span>@@ -167,11 +167,15 @@</span><br><span> </span><br><span> static int alive_timer_elapsed_ms(struct gprs_ns2_vc_priv *priv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        struct timeval now, elapsed;</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_gettimeofday(&now, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-      timersub(&now, &priv->alive.timer_started, &elapsed);</span><br><span style="color: hsl(120, 100%, 40%);">+  struct timespec now, elapsed;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       return 1000 * elapsed.tv_sec + elapsed.tv_usec / 1000;</span><br><span style="color: hsl(120, 100%, 40%);">+        if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+               return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   timespecsub(&now, &priv->alive.timer_started, &elapsed);</span><br><span style="color: hsl(120, 100%, 40%);">+       LOGNSVC(priv->nsvc, LOGL_ERROR, "elapsed: %ld, now: %ld, saved: %ld.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+         elapsed.tv_sec, now.tv_sec, priv->alive.timer_started.tv_sec);</span><br><span style="color: hsl(120, 100%, 40%);">+     return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000);</span><br><span> }</span><br><span> </span><br><span> static void recv_test_procedure(struct osmo_fsm_inst *fi)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22869">change 22869</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/+/22869"/><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: I41989d8f9f82f4d1f7b97f11577653699365c8ae </div>
<div style="display:none"> Gerrit-Change-Number: 22869 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </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-MessageType: merged </div>