[Xenomai-git] Philippe Gerum : copperplate/clockobj: fix restricted clock mode
Module: xenomai-forge
Branch: master
Commit: 11fa6a474dfcc72cbef51703e7f984eb93a681f3
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=11fa6a474dfcc72cbef51703e7f984eb93a681f3
Author: Philippe Gerum
Date: Wed Sep 24 11:45:26 2014 +0200
copperplate/clockobj: fix restricted clock mode
---
lib/copperplate/clockobj.c | 60 ++--
1 file changed, 41 insertions(+), 19 deletions(-)
diff --git a/lib/copperplate/clockobj.c b/lib/copperplate/clockobj.c
index fe823c7..1b6f5f6 100644
--- a/lib/copperplate/clockobj.c
+++ b/lib/copperplate/clockobj.c
@@ -231,51 +231,73 @@ int clockobj_set_resolution(struct clockobj *clkobj,
unsigned int resolution_ns)
#include
#include
+#ifdef CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED
+
ticks_t clockobj_get_tsc(void)
{
-#ifdef CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED
- /* Rare case with legacy uClibc+linuxthreads combo. */
struct timespec now;
+
+ /* Rare case with legacy uClibc+linuxthreads combo. */
__RT(clock_gettime(CLOCK_REALTIME, &now));
return xnarch_ullmul(now.tv_sec, 10) + now.tv_nsec;
-#else
- /* Guaranteed to be the source of CLOCK_COPPERPLATE. */
- return cobalt_read_tsc();
-#endif
}
-#ifndef CONFIG_XENO_LORES_CLOCK_DISABLED
-
-sticks_t clockobj_ns_to_ticks(struct clockobj *clkobj, sticks_t ns)
+void clockobj_get_time(struct clockobj *clkobj,
+ ticks_t *pticks, ticks_t *ptsc)
{
- /* Cobalt has optimized arith ops, use them. */
- return xnarch_ulldiv(ns, clkobj->resolution, NULL);
+ ticks_t ns;
+
+ ns = clockobj_get_tsc();
+ if (ptsc)
+ *ptsc = ns;
+
+ *pticks = clockobj_ns_to_ticks(clkobj, ns);
}
-#endif /* !CONFIG_XENO_LORES_CLOCK_DISABLED */
+#else /* !CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED */
+
+/*
+ * NOTE: we can't inline this routine, as we don't want to expose
+ * lib/cobalt/arch/.../include/asm/xenomai/tsc.h.
+ */
+ticks_t clockobj_get_tsc(void)
+{
+ /* Guaranteed to be the source of CLOCK_COPPERPLATE. */
+ return cobalt_read_tsc();
+}
void clockobj_get_time(struct clockobj *clkobj,
ticks_t *pticks, ticks_t *ptsc)
{
- unsigned long long ns, tsc;
+ ticks_t ns, tsc;
tsc = cobalt_read_tsc();
- ns = cobalt_ticks_to_ns_rounded(tsc);
- if (clockobj_get_resolution(clkobj) > 1)
- ns /= clockobj_get_resolution(clkobj);
- *pticks = ns;
-
if (ptsc)
*ptsc = tsc;
+
+ ns = cobalt_ticks_to_ns_rounded(tsc);
+ *pticks = clockobj_ns_to_ticks(clkobj, ns);
}
+#endif /* !CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED */
+
+#ifndef CONFIG_XENO_LORES_CLOCK_DISABLED
+
+sticks_t clockobj_ns_to_ticks(struct clockobj *clkobj, sticks_t ns)
+{
+ /* Cobalt has optimized arith ops, use them. */
+ return xnarch_ulldiv(ns, clkobj->resolution, NULL);
+}
+
+#endif /* !CONFIG_XENO_LORES_CLOCK_DISABLED */
+
void clockobj_get_date(struct clockobj *clkobj, ticks_t *pticks)
{
unsigned long long ns;
read_lock_nocancel(&clkobj->lock);
- ns = cobalt_ticks_to_ns(cobalt_read_tsc());
+ ns = cobalt_ticks_to_ns(clockobj_get_tsc());
/* Add offset to epoch. */
ns += (unsigned long long)clkobj->offset.tv_sec * 10ULL;
ns += clkobj->offset.tv_nsec;
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : copperplate/clockobj: fix restricted clock mode
Module: xenomai-forge
Branch: next
Commit: 11fa6a474dfcc72cbef51703e7f984eb93a681f3
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=11fa6a474dfcc72cbef51703e7f984eb93a681f3
Author: Philippe Gerum
Date: Wed Sep 24 11:45:26 2014 +0200
copperplate/clockobj: fix restricted clock mode
---
lib/copperplate/clockobj.c | 60 ++--
1 file changed, 41 insertions(+), 19 deletions(-)
diff --git a/lib/copperplate/clockobj.c b/lib/copperplate/clockobj.c
index fe823c7..1b6f5f6 100644
--- a/lib/copperplate/clockobj.c
+++ b/lib/copperplate/clockobj.c
@@ -231,51 +231,73 @@ int clockobj_set_resolution(struct clockobj *clkobj,
unsigned int resolution_ns)
#include
#include
+#ifdef CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED
+
ticks_t clockobj_get_tsc(void)
{
-#ifdef CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED
- /* Rare case with legacy uClibc+linuxthreads combo. */
struct timespec now;
+
+ /* Rare case with legacy uClibc+linuxthreads combo. */
__RT(clock_gettime(CLOCK_REALTIME, &now));
return xnarch_ullmul(now.tv_sec, 10) + now.tv_nsec;
-#else
- /* Guaranteed to be the source of CLOCK_COPPERPLATE. */
- return cobalt_read_tsc();
-#endif
}
-#ifndef CONFIG_XENO_LORES_CLOCK_DISABLED
-
-sticks_t clockobj_ns_to_ticks(struct clockobj *clkobj, sticks_t ns)
+void clockobj_get_time(struct clockobj *clkobj,
+ ticks_t *pticks, ticks_t *ptsc)
{
- /* Cobalt has optimized arith ops, use them. */
- return xnarch_ulldiv(ns, clkobj->resolution, NULL);
+ ticks_t ns;
+
+ ns = clockobj_get_tsc();
+ if (ptsc)
+ *ptsc = ns;
+
+ *pticks = clockobj_ns_to_ticks(clkobj, ns);
}
-#endif /* !CONFIG_XENO_LORES_CLOCK_DISABLED */
+#else /* !CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED */
+
+/*
+ * NOTE: we can't inline this routine, as we don't want to expose
+ * lib/cobalt/arch/.../include/asm/xenomai/tsc.h.
+ */
+ticks_t clockobj_get_tsc(void)
+{
+ /* Guaranteed to be the source of CLOCK_COPPERPLATE. */
+ return cobalt_read_tsc();
+}
void clockobj_get_time(struct clockobj *clkobj,
ticks_t *pticks, ticks_t *ptsc)
{
- unsigned long long ns, tsc;
+ ticks_t ns, tsc;
tsc = cobalt_read_tsc();
- ns = cobalt_ticks_to_ns_rounded(tsc);
- if (clockobj_get_resolution(clkobj) > 1)
- ns /= clockobj_get_resolution(clkobj);
- *pticks = ns;
-
if (ptsc)
*ptsc = tsc;
+
+ ns = cobalt_ticks_to_ns_rounded(tsc);
+ *pticks = clockobj_ns_to_ticks(clkobj, ns);
}
+#endif /* !CONFIG_XENO_COPPERPLATE_CLOCK_RESTRICTED */
+
+#ifndef CONFIG_XENO_LORES_CLOCK_DISABLED
+
+sticks_t clockobj_ns_to_ticks(struct clockobj *clkobj, sticks_t ns)
+{
+ /* Cobalt has optimized arith ops, use them. */
+ return xnarch_ulldiv(ns, clkobj->resolution, NULL);
+}
+
+#endif /* !CONFIG_XENO_LORES_CLOCK_DISABLED */
+
void clockobj_get_date(struct clockobj *clkobj, ticks_t *pticks)
{
unsigned long long ns;
read_lock_nocancel(&clkobj->lock);
- ns = cobalt_ticks_to_ns(cobalt_read_tsc());
+ ns = cobalt_ticks_to_ns(clockobj_get_tsc());
/* Add offset to epoch. */
ns += (unsigned long long)clkobj->offset.tv_sec * 10ULL;
ns += clkobj->offset.tv_nsec;
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
