<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9395">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">log warnings when measurements arrive from the future<br><br>We have observed problems which look like the monotonic clock<br>going backwards on Jenkins build workers, causing overflow in<br>a time delta calculation. When this happens, log an error and<br>don't process the measurement.<br><br>Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28<br>Related: OS#3225<br>---<br>M src/gprs_rlcmac_meas.cpp<br>1 file changed, 25 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/9395/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp</span><br><span>index ac01f2a..056db20 100644</span><br><span>--- a/src/gprs_rlcmac_meas.cpp</span><br><span>+++ b/src/gprs_rlcmac_meas.cpp</span><br><span>@@ -24,6 +24,7 @@</span><br><span> </span><br><span> #include <string.h></span><br><span> #include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span> </span><br><span> /*</span><br><span> * downlink measurement</span><br><span>@@ -78,6 +79,14 @@</span><br><span> tbf->meas.rssi_num++;</span><br><span> </span><br><span> osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (now_tv.tv_sec < rssi_tv->tv_sec ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (now_tv.tv_sec == rssi_tv->tv_sec && now_tv.tv_nsec < rssi_tv->tv_nsec)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMACMEAS, LOGL_ERROR, "Not processing RSSI measurement received from the future; "</span><br><span style="color: hsl(120, 100%, 40%);">+ "did the monotonic clock jump backwards? (now=%" PRIu64 ".%" PRIu64 " < %" PRIu64 ".%" PRIu64 ")\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint64_t)now_tv.tv_sec, (uint64_t)now_tv.tv_nsec,</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint64_t)rssi_tv->tv_sec, (uint64_t)rssi_tv->tv_nsec);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7)</span><br><span> + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000;</span><br><span> if (elapsed < 128)</span><br><span>@@ -130,6 +139,14 @@</span><br><span> tbf->m_bw.dl_loss_lost += lost;</span><br><span> </span><br><span> osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (now_tv.tv_sec < loss_tv->tv_sec ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (now_tv.tv_sec == loss_tv->tv_sec && now_tv.tv_nsec < loss_tv->tv_nsec)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMACMEAS, LOGL_ERROR, "Not processing lost frames measurement received from the future; "</span><br><span style="color: hsl(120, 100%, 40%);">+ "did the monotonic clock jump backwards? (now=%" PRIu64 ".%" PRIu64 " < %" PRIu64 ".%" PRIu64 ")\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint64_t)now_tv.tv_sec, (uint64_t)now_tv.tv_nsec,</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint64_t)loss_tv->tv_sec, (uint64_t)loss_tv->tv_nsec);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7)</span><br><span> + (((now_tv.tv_nsec - loss_tv->tv_nsec)/1000) << 7) / 1000000;</span><br><span> if (elapsed < 128)</span><br><span>@@ -174,6 +191,14 @@</span><br><span> tbf->m_bw.dl_bw_octets += octets;</span><br><span> </span><br><span> osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (now_tv.tv_sec < bw_tv->tv_sec ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (now_tv.tv_sec == bw_tv->tv_sec && now_tv.tv_nsec < bw_tv->tv_nsec)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMACMEAS, LOGL_ERROR, "Not processing bandwidth measurement received from the future; "</span><br><span style="color: hsl(120, 100%, 40%);">+ "did the monotonic clock jump backwards? (now=%" PRIu64 ".%" PRIu64 " < %" PRIu64 ".%" PRIu64 ")\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint64_t)now_tv.tv_sec, (uint64_t)now_tv.tv_nsec,</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint64_t)bw_tv->tv_sec, (uint64_t)bw_tv->tv_nsec);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7)</span><br><span> + (((now_tv.tv_nsec - bw_tv->tv_nsec)/1000) << 7) / 1000000;</span><br><span> if (elapsed < 128)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9395">change 9395</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/9395"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28 </div>
<div style="display:none"> Gerrit-Change-Number: 9395 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>