[PATCH tip/core/timers 1/4] timers: Track total number of timers in list
From: "Paul E. McKenney"
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 non-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
---
kernel/timer.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/kernel/timer.c b/kernel/timer.c
index 6582b82fa966..2245b7374c3d 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -81,6 +81,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;
@@ -392,6 +393,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
@@ -671,6 +673,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,
@@ -685,6 +688,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;
}
@@ -1560,6 +1564,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;
}
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH tip/core/timers 1/4] timers: Track total number of timers in list
From: Paul E. McKenney paul...@linux.vnet.ibm.com
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 non-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 paul...@linux.vnet.ibm.com
---
kernel/timer.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/kernel/timer.c b/kernel/timer.c
index 6582b82fa966..2245b7374c3d 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -81,6 +81,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;
@@ -392,6 +393,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
@@ -671,6 +673,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,
@@ -685,6 +688,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;
}
@@ -1560,6 +1564,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;
}
--
1.8.1.5
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
