X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftimer%2Ftest%2Frun.c;h=ca0435e3015bab0933c60a29dea3a326901dbc27;hp=e2d467eb0ebdb4a662c732f277a6c948f69403b8;hb=4ba104904176bc059167757c10d461703b6b06dc;hpb=63f770591286a5a61ef2857377eeab5e0e75d115

diff --git a/ccan/timer/test/run.c b/ccan/timer/test/run.c
index e2d467eb..ca0435e3 100644
--- a/ccan/timer/test/run.c
+++ b/ccan/timer/test/run.c
@@ -1,25 +1,31 @@
 #define CCAN_TIMER_DEBUG
 #include <ccan/timer/timer.h>
+#include <ccan/time/time.h>
+
+#define time_mono() fake_mono_time
+
+static struct timemono fake_mono_time;
+
 /* Include the C files directly. */
 #include <ccan/timer/timer.c>
 #include <ccan/tap/tap.h>
 
-static struct timeabs timeabs_from_nsec(unsigned long long nsec)
+static struct timemono timemono_from_nsec(unsigned long long nsec)
 {
-	struct timeabs epoch = { { 0, 0 } };
-	return timeabs_add(epoch, time_from_nsec(nsec));
+	struct timemono epoch = { { 0, 0 } };
+	return timemono_add(epoch, time_from_nsec(nsec));
 }
 
 int main(void)
 {
 	struct timers timers;
 	struct timer t[64];
-	struct timeabs earliest;
+	struct timemono earliest;
 	uint64_t i;
-	struct timeabs epoch = { { 0, 0 } };
+	const struct timemono epoch = { { 0, 0 } };
 
 	/* This is how many tests you plan to run */
-	plan_tests(488);
+	plan_tests(495);
 
 	timers_init(&timers, epoch);
 	ok1(timers_check(&timers, NULL));
@@ -29,10 +35,10 @@ int main(void)
 	/* timer_del can be called immediately after init. */
 	timer_del(&timers, &t[0]);
 
-	timer_add(&timers, &t[0], timeabs_from_nsec(1));
+	timer_addmono(&timers, &t[0], timemono_from_nsec(1));
 	ok1(timers_check(&timers, NULL));
 	ok1(timer_earliest(&timers, &earliest));
-	ok1(timeabs_eq(earliest, grains_to_time(t[0].time)));
+	ok1(timemono_eq(earliest, grains_to_time(t[0].time)));
 	timer_del(&timers, &t[0]);
 	ok1(timers_check(&timers, NULL));
 	ok1(!timer_earliest(&timers, &earliest));
@@ -43,10 +49,10 @@ int main(void)
 	/* Check timer ordering. */
 	for (i = 0; i < 32; i++) {
 		timer_init(&t[i*2]);
-		timer_add(&timers, &t[i*2], timeabs_from_nsec(1ULL << i));
+		timer_addmono(&timers, &t[i*2], timemono_from_nsec(1ULL << i));
 		ok1(timers_check(&timers, NULL));
 		timer_init(&t[i*2+1]);
-		timer_add(&timers, &t[i*2+1], timeabs_from_nsec((1ULL << i) + 1));
+		timer_addmono(&timers, &t[i*2+1], timemono_from_nsec((1ULL << i) + 1));
 		ok1(timers_check(&timers, NULL));
 	}
 
@@ -68,9 +74,9 @@ int main(void)
 	for (i = 0; i < 32; i++) {
 		uint64_t exp = (uint64_t)TIMER_GRANULARITY << i;
 
-		timer_add(&timers, &t[i*2], timeabs_from_nsec(exp));
+		timer_addmono(&timers, &t[i*2], timemono_from_nsec(exp));
 		ok1(timers_check(&timers, NULL));
-		timer_add(&timers, &t[i*2+1], timeabs_from_nsec(exp + 1));
+		timer_addmono(&timers, &t[i*2+1], timemono_from_nsec(exp + 1));
 		ok1(timers_check(&timers, NULL));
 	}
 
@@ -90,7 +96,19 @@ int main(void)
 	}
 
 	ok1(!timer_earliest(&timers, &earliest));
-
+	ok1(timers_check(&timers, NULL));
+	timers_cleanup(&timers);
+	
+	/* Relative timers. */
+	timers_init(&timers, epoch);
+	fake_mono_time = timemono_from_nsec(TIMER_GRANULARITY);
+	timer_addrel(&timers, &t[0], time_from_sec(1));
+	ok1(timer_earliest(&timers, &earliest));
+	ok1(timers_check(&timers, NULL));
+	ok1(earliest.ts.tv_sec == 1 && earliest.ts.tv_nsec == TIMER_GRANULARITY);
+	ok1(timers_expire(&timers, earliest) == &t[0]);
+	ok1(!timer_earliest(&timers, &earliest));
+	ok1(timers_check(&timers, NULL));
 	timers_cleanup(&timers);
 
 	/* This exits depending on whether all tests passed */