iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] hrtimers: posix-timer: cleanup common_timer_get()

Browse Source 
Cleanup common_timer_get() a little.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roman Zippel 2006-03-26 01:38:07 -08:00 committed by Linus Torvalds
parent 44f2147551
commit 3b98a53281
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
kernel/posix-timers.c
View File

@ -608,39 +608,41 @@ static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags)
static void static void
common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting) common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting)
{ {
ktime_t remaining; ktime_t now, remaining, iv;
struct hrtimer *timer = &timr->it.real.timer; struct hrtimer *timer = &timr->it.real.timer;
memset(cur_setting, 0, sizeof(struct itimerspec)); memset(cur_setting, 0, sizeof(struct itimerspec));
remaining = hrtimer_get_remaining(timer);
/* Time left ? or timer pending */ iv = timr->it.real.interval;
if (remaining.tv64 > 0 || hrtimer_active(timer))
goto calci;
/* interval timer ? */ /* interval timer ? */
if (timr->it.real.interval.tv64 == 0) if (iv.tv64)
cur_setting->it_interval = ktime_to_timespec(iv);
else if (!hrtimer_active(timer) &&
(timr->it_sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE)
return; return;
now = timer->base->get_time();
/* /*
* When a requeue is pending or this is a SIGEV_NONE timer * When a requeue is pending or this is a SIGEV_NONE
* move the expiry time forward by intervals, so expiry is > * timer move the expiry time forward by intervals, so
* now. * expiry is > now.
*/ */
if (timr->it_requeue_pending & REQUEUE_PENDING || if (iv.tv64 && (timr->it_requeue_pending & REQUEUE_PENDING ||
(timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE) { (timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE))
timr->it_overrun += timr->it_overrun += hrtimer_forward(timer, now, iv);
hrtimer_forward(timer, timer->base->get_time(),
timr->it.real.interval); remaining = ktime_sub(timer->expires, now);
remaining = hrtimer_get_remaining(timer);
}
calci:
/* interval timer ? */
if (timr->it.real.interval.tv64 != 0)
cur_setting->it_interval =
ktime_to_timespec(timr->it.real.interval);
/* Return 0 only, when the timer is expired and not pending */ /* Return 0 only, when the timer is expired and not pending */
if (remaining.tv64 <= 0) if (remaining.tv64 <= 0) {
cur_setting->it_value.tv_nsec = 1; /*
else * A single shot SIGEV_NONE timer must return 0, when
* it is expired !
*/
if ((timr->it_sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE)
cur_setting->it_value.tv_nsec = 1;
} else
cur_setting->it_value = ktime_to_timespec(remaining); cur_setting->it_value = ktime_to_timespec(remaining);
} }