Change in ...libosmo-netif[master]: tests: osmux_test: Use fake time also for monotonic clock

[laforge]

laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15669 )

Change subject: tests: osmux_test: Use fake time also for monotonic clock
......................................................................

tests: osmux_test: Use fake time also for monotonic clock

Currently osmux related code uses both gettimeofday on some parts and
clock_gettime(CLOCK_MONOTONIC) on others (for different purposes).

Let's fake both clocks and not only the one used by gettimeofday API.

Change-Id: I4e1a0eb4f8c4ea1bc0f963afa18b116d3af9978c
---
M tests/osmux/osmux_test.c
1 file changed, 29 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c
index e2eb777..6825b56 100644
--- a/tests/osmux/osmux_test.c
+++ b/tests/osmux/osmux_test.c
@@ -63,6 +63,31 @@
 static struct timeval last;
 #endif
 
+#define clock_debug(fmt, args...) \
+	do { \
+		struct timespec ts; \
+		struct timeval tv; \
+		osmo_clock_gettime(CLOCK_MONOTONIC, &ts); \
+		osmo_gettimeofday(&tv, NULL); \
+		printf("sys={%lu.%06lu}, mono={%lu.%06lu}: " fmt, \
+			tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, ##args); \
+	} while(0)
+
+static void clock_override_enable(bool enable)
+{
+	osmo_gettimeofday_override = enable;
+	osmo_clock_override_enable(CLOCK_MONOTONIC, enable);
+}
+
+static void clock_override_add_debug(long sec, long usec, bool dbg)
+{
+	osmo_gettimeofday_override_add(sec, usec);
+	osmo_clock_override_add(CLOCK_MONOTONIC, sec, usec*1000);
+	if (dbg)
+		clock_debug("clock_override_add\n");
+}
+#define clock_override_add(sec, usec) clock_override_add_debug(sec, usec, false)
+
 static void tx_cb(struct msgb *msg, void *data)
 {
 	struct rtp_hdr *rtph = (struct rtp_hdr *)msg->data;
@@ -161,13 +186,13 @@
 			}
 		}
 #if !OSMUX_TEST_USE_TIMING
-		osmo_gettimeofday_override_add(0, PKT_TIME_USEC);
+		clock_override_add(0, PKT_TIME_USEC);
 #endif
 	}
 
 	while (rtp_pkts) {
 #if !OSMUX_TEST_USE_TIMING
-		osmo_gettimeofday_override_add(1, 0);
+		clock_override_add(1, 0);
 #endif
 		osmo_select_main(0);
 	}
@@ -234,7 +259,7 @@
 			for (j = 0; j < k-2; j++) {
 				osmo_select_main(0);
 #if !OSMUX_TEST_USE_TIMING
-				osmo_gettimeofday_override_add(0, PKT_TIME_USEC);
+				clock_override_add(0, PKT_TIME_USEC);
 #endif
 			}
 
@@ -260,7 +285,7 @@
 #if !OSMUX_TEST_USE_TIMING
 	/* This test uses fake time to speedup the run, unless we want to manually
 	 * test time specific stuff */
-	osmo_gettimeofday_override = true;
+	clock_override_enable(true);
 #endif
 
 	/* This test doesn't use it, but osmux requires it internally. */

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15669
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I4e1a0eb4f8c4ea1bc0f963afa18b116d3af9978c
Gerrit-Change-Number: 15669
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191004/b8ab09a6/attachment.htm>