From: Antti Kantee <pooka@iki.fi>
Date: Tue, 21 Apr 2015 13:00:18 +0000 (+0000)
Subject: Rename bmk_clock_*() to bmk_platform_clock_*()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6b11ec6e83f9d88c6b0b20e48f032dc2edc263db;p=people%2Fliuw%2Frumprun.git

Rename bmk_clock_*() to bmk_platform_clock_*()

They are expected to be implemented by the underlying platform.
---

diff --git a/include/bmk-core/sched.h b/include/bmk-core/sched.h
index 948719e..76dbb31 100644
--- a/include/bmk-core/sched.h
+++ b/include/bmk-core/sched.h
@@ -73,13 +73,14 @@ struct bmk_thread *bmk_cpu_sched_current(void);
 int *bmk_sched_geterrno(void);
 const char 	*bmk_sched_threadname(struct bmk_thread *);
 
-bmk_time_t	bmk_clock_monotonic(void);
-bmk_time_t	bmk_clock_epochoffset(void);
-
 /* XXX: coming up with better names considered useful */
 void	bmk_cpu_sched_bouncer(void);
 void	bmk__cpu_switch(void *, void *);
 
+
+bmk_time_t	bmk_platform_clock_monotonic(void);
+bmk_time_t	bmk_platform_clock_epochoffset(void);
+
 void	bmk_platform_cpu_sched_switch(struct bmk_tcb *, struct bmk_tcb *);
 
 #endif /* _BMK_CORE_SCHED_H_ */
diff --git a/lib/libbmk_core/sched.c b/lib/libbmk_core/sched.c
index 5fcd402..c78356f 100644
--- a/lib/libbmk_core/sched.c
+++ b/lib/libbmk_core/sched.c
@@ -201,7 +201,7 @@ bmk_sched(void)
 		bmk_time_t tm, wakeup;
 
 		/* block domain for max 1s */
-		tm = bmk_clock_monotonic();
+		tm = bmk_platform_clock_monotonic();
 		wakeup = tm + 1*1000*1000*1000ULL;
 
 		next = NULL;
@@ -434,7 +434,8 @@ int
 bmk_sched_nanosleep(bmk_time_t nsec)
 {
 
-	return bmk_sched_nanosleep_abstime(nsec + bmk_clock_monotonic());
+	return bmk_sched_nanosleep_abstime(nsec
+	    + bmk_platform_clock_monotonic());
 }
 
 void
diff --git a/lib/libbmk_rumpuser/rumpuser_clock.c b/lib/libbmk_rumpuser/rumpuser_clock.c
index 746bc68..0702321 100644
--- a/lib/libbmk_rumpuser/rumpuser_clock.c
+++ b/lib/libbmk_rumpuser/rumpuser_clock.c
@@ -37,11 +37,11 @@ rumpuser_clock_gettime(int which, int64_t *sec, long *nsec)
 {
 	bmk_time_t time;
 
-	time = bmk_clock_monotonic();
+	time = bmk_platform_clock_monotonic();
 
 	switch (which) {
 	case RUMPUSER_CLOCK_RELWALL:
-		time += bmk_clock_epochoffset();
+		time += bmk_platform_clock_epochoffset();
 		break;
 	case RUMPUSER_CLOCK_ABSMONO:
 		break;
diff --git a/lib/libbmk_rumpuser/rumpuser_synch.c b/lib/libbmk_rumpuser/rumpuser_synch.c
index 8846efa..bd3c051 100644
--- a/lib/libbmk_rumpuser/rumpuser_synch.c
+++ b/lib/libbmk_rumpuser/rumpuser_synch.c
@@ -59,7 +59,7 @@ wait(struct waithead *wh, bmk_time_t nsec)
 	TAILQ_INSERT_TAIL(wh, &w, entries);
 	w.onlist = 1;
 	if (nsec != WAIT_NOTIMEOUT)
-		wakeup = bmk_clock_monotonic() + nsec;
+		wakeup = bmk_platform_clock_monotonic() + nsec;
 	bmk_sched_block_timeout(w.who, wakeup);
 	bmk_sched();
 
diff --git a/lib/librumprun_base/_lwp.c b/lib/librumprun_base/_lwp.c
index 57be77a..5aa7792 100644
--- a/lib/librumprun_base/_lwp.c
+++ b/lib/librumprun_base/_lwp.c
@@ -206,7 +206,7 @@ _lwp_park(clockid_t clock_id, int flags, const struct timespec *ts,
 		bmk_time_t nsecs = ts->tv_sec*1000*1000*1000 + ts->tv_nsec;
 
 		if (flags & TIMER_ABSTIME) {
-			nsecs -= bmk_clock_epochoffset();
+			nsecs -= bmk_platform_clock_epochoffset();
 			rv = bmk_sched_nanosleep_abstime(nsecs);
 		} else {
 			rv = bmk_sched_nanosleep(nsecs);
diff --git a/platform/baremetal/clock.c b/platform/baremetal/clock.c
index e3f4c92..d795296 100644
--- a/platform/baremetal/clock.c
+++ b/platform/baremetal/clock.c
@@ -28,14 +28,14 @@
 #include <bmk-core/sched.h>
 
 bmk_time_t
-bmk_clock_monotonic(void)
+bmk_platform_clock_monotonic(void)
 {
 
 	return bmk_cpu_clock_now();
 }
 
 bmk_time_t
-bmk_clock_epochoffset(void)
+bmk_platform_clock_epochoffset(void)
 {
 
 	return 0; /* needs more bits */
diff --git a/platform/xen/xen/arch/x86/time.c b/platform/xen/xen/arch/x86/time.c
index ffea31e..cbac21b 100644
--- a/platform/xen/xen/arch/x86/time.c
+++ b/platform/xen/xen/arch/x86/time.c
@@ -197,7 +197,7 @@ void minios_clock_wall(uint32_t *sec, uint64_t *nsec)
 
 /* return monotonic clock offset to wall epoch */
 bmk_time_t
-bmk_clock_epochoffset(void)
+bmk_platform_clock_epochoffset(void)
 {
 	struct timespec myts;
 
diff --git a/platform/xen/xen/clock.c b/platform/xen/xen/clock.c
index ed6631a..18241ab 100644
--- a/platform/xen/xen/clock.c
+++ b/platform/xen/xen/clock.c
@@ -28,7 +28,7 @@
 #include <bmk-core/sched.h>
 
 bmk_time_t
-bmk_clock_monotonic(void)
+bmk_platform_clock_monotonic(void)
 {
 
 	return minios_clock_monotonic();