diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-01-14 20:20:43 -0800 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-23 10:50:40 +0100 |
| commit | ddde2e047f377067ef00ed4bc12e175510c39930 (patch) | |
| tree | 825d7bd30d03a307f37ae2966cb45bea1a4fead3 | |
| parent | 9d0d1ef8471a8309bd0124fd2fdc77a6fa0ac3c4 (diff) | |
timers: Track total number of timers in list
upstream commit: fff421580f512fc044cc7421fdff31a7a6997350
Currently, the tvec_base structure's ->active_timers field tracks only
the non-deferrable timers, which means that even if ->active_timers is
zero, there might well be deferrable timers in the list. This commit
therefore adds an ->all_timers field to track all the timers, whether
deferrable or not.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Tested-by: Mike Galbraith <bitbucket@online.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
| -rw-r--r-- | kernel/timer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 8f1687a4b9c2..251fdacfebdb 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -84,6 +84,7 @@ struct tvec_base { unsigned long timer_jiffies; unsigned long next_timer; unsigned long active_timers; + unsigned long all_timers; struct tvec_root tv1; struct tvec tv2; struct tvec tv3; @@ -395,6 +396,7 @@ static void internal_add_timer(struct tvec_base *base, struct timer_list *timer) base->next_timer = timer->expires; base->active_timers++; } + base->all_timers++; } #ifdef CONFIG_TIMER_STATS @@ -674,6 +676,7 @@ detach_expired_timer(struct timer_list *timer, struct tvec_base *base) detach_timer(timer, true); if (!tbase_get_deferrable(timer->base)) base->active_timers--; + base->all_timers--; } static int detach_if_pending(struct timer_list *timer, struct tvec_base *base, @@ -688,6 +691,7 @@ static int detach_if_pending(struct timer_list *timer, struct tvec_base *base, if (timer->expires == base->next_timer) base->next_timer = base->timer_jiffies; } + base->all_timers--; return 1; } @@ -1677,6 +1681,7 @@ static int init_timers_cpu(int cpu) base->timer_jiffies = jiffies; base->next_timer = base->timer_jiffies; base->active_timers = 0; + base->all_timers = 0; return 0; } |