Module: xenomai-3
Branch: wip/dovetail
Commit: 4b4cef058787c4457ffaa899f6fa086d1947d59e
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=4b4cef058787c4457ffaa899f6fa086d1947d59e
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Mon Feb 22 18:34:44 2016 +0100
cobalt/posix/timer: Return interval value also for stopped timers
If a timer is not running, it may still have a non-null interval value.
This has to be returned according to the standard.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
kernel/cobalt/posix/timer.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/kernel/cobalt/posix/timer.c b/kernel/cobalt/posix/timer.c
index 5e77454..cf1c919 100644
--- a/kernel/cobalt/posix/timer.c
+++ b/kernel/cobalt/posix/timer.c
@@ -268,16 +268,14 @@ out:
void __cobalt_timer_getval(struct xntimer *__restrict__ timer,
struct itimerspec *__restrict__ value)
{
+ ns2ts(&value->it_interval, xntimer_interval(timer));
+
if (!xntimer_running_p(timer)) {
value->it_value.tv_sec = 0;
value->it_value.tv_nsec = 0;
- value->it_interval.tv_sec = 0;
- value->it_interval.tv_nsec = 0;
- return;
+ } else {
+ ns2ts(&value->it_value, xntimer_get_timeout(timer));
}
-
- ns2ts(&value->it_value, xntimer_get_timeout(timer));
- ns2ts(&value->it_interval, xntimer_interval(timer));
}
static inline void
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
