[PATCH] hrtimers: pass current time to hrtimer_forward()
Pass current time to hrtimer_forward(). This allows to use the softirq time in the timer base when the forward function is called from the timer callback. Other places pass current time with a call to timer->base->get_time(). 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:
parent
92127c7a45
commit
44f2147551
|
@ -130,7 +130,8 @@ static inline int hrtimer_active(const struct hrtimer *timer)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Forward a hrtimer so it expires after now: */
|
/* Forward a hrtimer so it expires after now: */
|
||||||
extern unsigned long hrtimer_forward(struct hrtimer *timer, ktime_t interval);
|
extern unsigned long
|
||||||
|
hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);
|
||||||
|
|
||||||
/* Precise sleep: */
|
/* Precise sleep: */
|
||||||
extern long hrtimer_nanosleep(struct timespec *rqtp,
|
extern long hrtimer_nanosleep(struct timespec *rqtp,
|
||||||
|
|
|
@ -301,18 +301,17 @@ void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags)
|
||||||
* hrtimer_forward - forward the timer expiry
|
* hrtimer_forward - forward the timer expiry
|
||||||
*
|
*
|
||||||
* @timer: hrtimer to forward
|
* @timer: hrtimer to forward
|
||||||
|
* @now: forward past this time
|
||||||
* @interval: the interval to forward
|
* @interval: the interval to forward
|
||||||
*
|
*
|
||||||
* Forward the timer expiry so it will expire in the future.
|
* Forward the timer expiry so it will expire in the future.
|
||||||
* Returns the number of overruns.
|
* Returns the number of overruns.
|
||||||
*/
|
*/
|
||||||
unsigned long
|
unsigned long
|
||||||
hrtimer_forward(struct hrtimer *timer, ktime_t interval)
|
hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
|
||||||
{
|
{
|
||||||
unsigned long orun = 1;
|
unsigned long orun = 1;
|
||||||
ktime_t delta, now;
|
ktime_t delta;
|
||||||
|
|
||||||
now = timer->base->get_time();
|
|
||||||
|
|
||||||
delta = ktime_sub(now, timer->expires);
|
delta = ktime_sub(now, timer->expires);
|
||||||
|
|
||||||
|
|
|
@ -136,6 +136,7 @@ int it_real_fn(void *data)
|
||||||
|
|
||||||
if (tsk->signal->it_real_incr.tv64 != 0) {
|
if (tsk->signal->it_real_incr.tv64 != 0) {
|
||||||
hrtimer_forward(&tsk->signal->real_timer,
|
hrtimer_forward(&tsk->signal->real_timer,
|
||||||
|
tsk->signal->real_timer.base->softirq_time,
|
||||||
tsk->signal->it_real_incr);
|
tsk->signal->it_real_incr);
|
||||||
|
|
||||||
return HRTIMER_RESTART;
|
return HRTIMER_RESTART;
|
||||||
|
|
|
@ -251,15 +251,18 @@ __initcall(init_posix_timers);
|
||||||
|
|
||||||
static void schedule_next_timer(struct k_itimer *timr)
|
static void schedule_next_timer(struct k_itimer *timr)
|
||||||
{
|
{
|
||||||
|
struct hrtimer *timer = &timr->it.real.timer;
|
||||||
|
|
||||||
if (timr->it.real.interval.tv64 == 0)
|
if (timr->it.real.interval.tv64 == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
timr->it_overrun += hrtimer_forward(&timr->it.real.timer,
|
timr->it_overrun += hrtimer_forward(timer, timer->base->get_time(),
|
||||||
timr->it.real.interval);
|
timr->it.real.interval);
|
||||||
|
|
||||||
timr->it_overrun_last = timr->it_overrun;
|
timr->it_overrun_last = timr->it_overrun;
|
||||||
timr->it_overrun = -1;
|
timr->it_overrun = -1;
|
||||||
++timr->it_requeue_pending;
|
++timr->it_requeue_pending;
|
||||||
hrtimer_restart(&timr->it.real.timer);
|
hrtimer_restart(timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -334,6 +337,7 @@ EXPORT_SYMBOL_GPL(posix_timer_event);
|
||||||
static int posix_timer_fn(void *data)
|
static int posix_timer_fn(void *data)
|
||||||
{
|
{
|
||||||
struct k_itimer *timr = data;
|
struct k_itimer *timr = data;
|
||||||
|
struct hrtimer *timer = &timr->it.real.timer;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int si_private = 0;
|
int si_private = 0;
|
||||||
int ret = HRTIMER_NORESTART;
|
int ret = HRTIMER_NORESTART;
|
||||||
|
@ -351,7 +355,8 @@ static int posix_timer_fn(void *data)
|
||||||
*/
|
*/
|
||||||
if (timr->it.real.interval.tv64 != 0) {
|
if (timr->it.real.interval.tv64 != 0) {
|
||||||
timr->it_overrun +=
|
timr->it_overrun +=
|
||||||
hrtimer_forward(&timr->it.real.timer,
|
hrtimer_forward(timer,
|
||||||
|
timer->base->softirq_time,
|
||||||
timr->it.real.interval);
|
timr->it.real.interval);
|
||||||
ret = HRTIMER_RESTART;
|
ret = HRTIMER_RESTART;
|
||||||
++timr->it_requeue_pending;
|
++timr->it_requeue_pending;
|
||||||
|
@ -623,7 +628,8 @@ common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting)
|
||||||
if (timr->it_requeue_pending & REQUEUE_PENDING ||
|
if (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, timr->it.real.interval);
|
hrtimer_forward(timer, timer->base->get_time(),
|
||||||
|
timr->it.real.interval);
|
||||||
remaining = hrtimer_get_remaining(timer);
|
remaining = hrtimer_get_remaining(timer);
|
||||||
}
|
}
|
||||||
calci:
|
calci:
|
||||||
|
|
Loading…
Reference in a new issue