<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/15669">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: osmux_test: Use fake time also for monotonic clock<br><br>Currently osmux related code uses both gettimeofday on some parts and<br>clock_gettime(CLOCK_MONOTONIC) on others (for different purposes).<br><br>Let's fake both clocks and not only the one used by gettimeofday API.<br><br>Change-Id: I4e1a0eb4f8c4ea1bc0f963afa18b116d3af9978c<br>---<br>M tests/osmux/osmux_test.c<br>1 file changed, 29 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c</span><br><span>index e2eb777..6825b56 100644</span><br><span>--- a/tests/osmux/osmux_test.c</span><br><span>+++ b/tests/osmux/osmux_test.c</span><br><span>@@ -63,6 +63,31 @@</span><br><span> static struct timeval last;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define clock_debug(fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timespec ts; \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval tv; \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_gettime(CLOCK_MONOTONIC, &ts); \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gettimeofday(&tv, NULL); \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("sys={%lu.%06lu}, mono={%lu.%06lu}: " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, ##args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void clock_override_enable(bool enable)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gettimeofday_override = enable;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_override_enable(CLOCK_MONOTONIC, enable);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void clock_override_add_debug(long sec, long usec, bool dbg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gettimeofday_override_add(sec, usec);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_override_add(CLOCK_MONOTONIC, sec, usec*1000);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dbg)</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_debug("clock_override_add\n");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#define clock_override_add(sec, usec) clock_override_add_debug(sec, usec, false)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void tx_cb(struct msgb *msg, void *data)</span><br><span> {</span><br><span> struct rtp_hdr *rtph = (struct rtp_hdr *)msg->data;</span><br><span>@@ -161,13 +186,13 @@</span><br><span> }</span><br><span> }</span><br><span> #if !OSMUX_TEST_USE_TIMING</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override_add(0, PKT_TIME_USEC);</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_override_add(0, PKT_TIME_USEC);</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span> while (rtp_pkts) {</span><br><span> #if !OSMUX_TEST_USE_TIMING</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override_add(1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_override_add(1, 0);</span><br><span> #endif</span><br><span> osmo_select_main(0);</span><br><span> }</span><br><span>@@ -234,7 +259,7 @@</span><br><span> for (j = 0; j < k-2; j++) {</span><br><span> osmo_select_main(0);</span><br><span> #if !OSMUX_TEST_USE_TIMING</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override_add(0, PKT_TIME_USEC);</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_override_add(0, PKT_TIME_USEC);</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span>@@ -260,7 +285,7 @@</span><br><span> #if !OSMUX_TEST_USE_TIMING</span><br><span> /* This test uses fake time to speedup the run, unless we want to manually</span><br><span> * test time specific stuff */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gettimeofday_override = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_override_enable(true);</span><br><span> #endif</span><br><span> </span><br><span> /* This test doesn't use it, but osmux requires it internally. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/15669">change 15669</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/libosmo-netif/+/15669"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4e1a0eb4f8c4ea1bc0f963afa18b116d3af9978c </div>
<div style="display:none"> Gerrit-Change-Number: 15669 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>