Commit bffe4248 authored by Richard Larocque's avatar Richard Larocque Committed by Greg Kroah-Hartman

alarmtimer: Return relative times in timer_gettime

commit e86fea76 upstream.

Returns the time remaining for an alarm timer, rather than the time at
which it is scheduled to expire.  If the timer has already expired or it
is not currently scheduled, the it_value's members are set to zero.

This new behavior matches that of the other posix-timers and the POSIX
specifications.

This is a change in user-visible behavior, and may break existing
applications.  Hopefully, few users rely on the old incorrect behavior.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Sharvil Nanavati <sharvil@google.com>
Signed-off-by: default avatarRichard Larocque <rlarocque@google.com>
[jstultz: minor style tweak]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79b9b729
...@@ -541,18 +541,22 @@ static int alarm_timer_create(struct k_itimer *new_timer) ...@@ -541,18 +541,22 @@ static int alarm_timer_create(struct k_itimer *new_timer)
* @new_timer: k_itimer pointer * @new_timer: k_itimer pointer
* @cur_setting: itimerspec data to fill * @cur_setting: itimerspec data to fill
* *
* Copies the itimerspec data out from the k_itimer * Copies out the current itimerspec data
*/ */
static void alarm_timer_get(struct k_itimer *timr, static void alarm_timer_get(struct k_itimer *timr,
struct itimerspec *cur_setting) struct itimerspec *cur_setting)
{ {
memset(cur_setting, 0, sizeof(struct itimerspec)); ktime_t relative_expiry_time =
alarm_expires_remaining(&(timr->it.alarm.alarmtimer));
cur_setting->it_interval = if (ktime_to_ns(relative_expiry_time) > 0) {
ktime_to_timespec(timr->it.alarm.interval); cur_setting->it_value = ktime_to_timespec(relative_expiry_time);
cur_setting->it_value = } else {
ktime_to_timespec(timr->it.alarm.alarmtimer.node.expires); cur_setting->it_value.tv_sec = 0;
return; cur_setting->it_value.tv_nsec = 0;
}
cur_setting->it_interval = ktime_to_timespec(timr->it.alarm.interval);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment