<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9397">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix time-delta calculations for measurement reports<br><br>The previous implementation unconditionally subtracted nanosecond<br>values from different time measurements, causing overflow if the<br>current measurement was taken in less of a fraction of a second<br>than the past measurement. Use timespecsub() instead, which<br>accounts for nanoseconds correctly.<br><br>Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887<br>Related: OS#3225<br>---<br>M src/gprs_rlcmac_meas.cpp<br>1 file changed, 14 insertions(+), 17 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/97/9397/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..cffdbc6 100644</span><br><span>--- a/src/gprs_rlcmac_meas.cpp</span><br><span>+++ b/src/gprs_rlcmac_meas.cpp</span><br><span>@@ -17,6 +17,8 @@</span><br><span> * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer_compat.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <gprs_rlcmac.h></span><br><span> #include <gprs_debug.h></span><br><span> #include <pcu_l1_if.h></span><br><span>@@ -72,15 +74,15 @@</span><br><span> int gprs_rlcmac_rssi(struct gprs_rlcmac_tbf *tbf, int8_t rssi)</span><br><span> {</span><br><span> struct timespec now_tv, *rssi_tv = &tbf->meas.rssi_tv;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t elapsed;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timespec elapsed;</span><br><span> </span><br><span> tbf->meas.rssi_sum += rssi;</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(0, 100%, 40%);">- elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7)</span><br><span style="color: hsl(0, 100%, 40%);">- + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000;</span><br><span style="color: hsl(0, 100%, 40%);">- if (elapsed < 128)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ timespecsub(&now_tv, rssi_tv, &elapsed);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (elapsed.tv_sec < 1)</span><br><span> return 0;</span><br><span> </span><br><span> gprs_rlcmac_rssi_rep(tbf);</span><br><span>@@ -116,7 +118,7 @@</span><br><span> uint16_t lost)</span><br><span> {</span><br><span> struct timespec now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t elapsed;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timespec elapsed;</span><br><span> uint16_t sum = received + lost;</span><br><span> </span><br><span> /* No measurement values */</span><br><span>@@ -129,10 +131,8 @@</span><br><span> tbf->m_bw.dl_loss_received += received;</span><br><span> tbf->m_bw.dl_loss_lost += lost;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv);</span><br><span style="color: hsl(0, 100%, 40%);">- elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7)</span><br><span style="color: hsl(0, 100%, 40%);">- + (((now_tv.tv_nsec - loss_tv->tv_nsec)/1000) << 7) / 1000000;</span><br><span style="color: hsl(0, 100%, 40%);">- if (elapsed < 128)</span><br><span style="color: hsl(120, 100%, 40%);">+ timespecsub(&now_tv, loss_tv, &elapsed);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (elapsed.tv_sec < 1)</span><br><span> return 0;</span><br><span> </span><br><span> gprs_rlcmac_lost_rep(tbf);</span><br><span>@@ -169,21 +169,18 @@</span><br><span> int gprs_rlcmac_dl_bw(struct gprs_rlcmac_dl_tbf *tbf, uint16_t octets)</span><br><span> {</span><br><span> struct timespec now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t elapsed;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timespec elapsed;</span><br><span> </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(0, 100%, 40%);">- elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7)</span><br><span style="color: hsl(0, 100%, 40%);">- + (((now_tv.tv_nsec - bw_tv->tv_nsec)/1000) << 7) / 1000000;</span><br><span style="color: hsl(0, 100%, 40%);">- if (elapsed < 128)</span><br><span style="color: hsl(120, 100%, 40%);">+ timespecsub(&now_tv, bw_tv, &elapsed);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (elapsed.tv_sec < 1)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_bw.dl_throughput = (tbf->m_bw.dl_bw_octets/elapsed);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_bw.dl_throughput = (tbf->m_bw.dl_bw_octets << 10) / ((elapsed.tv_sec << 10) + (elapsed.tv_nsec >> 20));</span><br><span> LOGP(DRLCMACMEAS, LOGL_INFO, "DL Bandwitdh of IMSI=%s / TLLI=0x%08x: "</span><br><span style="color: hsl(0, 100%, 40%);">- "%d KBits/s\n", tbf->imsi(), tbf->tlli(),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->m_bw.dl_bw_octets / elapsed);</span><br><span style="color: hsl(120, 100%, 40%);">+ "%d KBits/s\n", tbf->imsi(), tbf->tlli(), tbf->m_bw.dl_throughput);</span><br><span> </span><br><span> /* reset bandwidth values timestamp */</span><br><span> memcpy(bw_tv, &now_tv, sizeof(*bw_tv));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9397">change 9397</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/9397"/><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: I7d22e7b5902c230efeae66eb20c17026a4037887 </div>
<div style="display:none"> Gerrit-Change-Number: 9397 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>