[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-67aa0f767af488a7f1e41cccb4f7a4893f24a1ab@git.kernel.org>
Date: Tue, 24 Mar 2009 22:18:30 GMT
From: Luis Henriques <henrix@...o.pt>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
peterz@...radead.org, henrix@...o.pt, ghaskins@...ell.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:sched/cleanups] sched: remove unused fields from struct rq
Commit-ID: 67aa0f767af488a7f1e41cccb4f7a4893f24a1ab
Gitweb: http://git.kernel.org/tip/67aa0f767af488a7f1e41cccb4f7a4893f24a1ab
Author: Luis Henriques <henrix@...o.pt>
AuthorDate: Tue, 24 Mar 2009 22:10:02 +0000
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Tue, 24 Mar 2009 23:16:51 +0100
sched: remove unused fields from struct rq
Impact: cleanup, new schedstat ABI
Since they are used on in statistics and are always set to zero, the
following fields from struct rq have been removed: yld_exp_empty,
yld_act_empty and yld_both_empty.
Both Sched Debug and SCHEDSTAT_VERSION versions has also been
incremented since ABIs have been changed.
The schedtop tool has been updated to properly handle new version of
schedstat:
http://rt.wiki.kernel.org/index.php/Schedtop_utility
Signed-off-by: Luis Henriques <henrix@...o.pt>
Acked-by: Gregory Haskins <ghaskins@...ell.com>
Acked-by: Peter Zijlstra <peterz@...radead.org>
LKML-Reference: <20090324221002.GA10061@...es.domain.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/sched.c | 3 ---
kernel/sched_debug.c | 5 +----
kernel/sched_stats.h | 7 +++----
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index d2dfe4c..7b389c7 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -638,9 +638,6 @@ struct rq {
/* could above be rq->cfs_rq.exec_clock + rq->rt_rq.rt_runtime ? */
/* sys_sched_yield() stats */
- unsigned int yld_exp_empty;
- unsigned int yld_act_empty;
- unsigned int yld_both_empty;
unsigned int yld_count;
/* schedule() stats */
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 4daebff..467ca72 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -286,9 +286,6 @@ static void print_cpu(struct seq_file *m, int cpu)
#ifdef CONFIG_SCHEDSTATS
#define P(n) SEQ_printf(m, " .%-30s: %d\n", #n, rq->n);
- P(yld_exp_empty);
- P(yld_act_empty);
- P(yld_both_empty);
P(yld_count);
P(sched_switch);
@@ -313,7 +310,7 @@ static int sched_debug_show(struct seq_file *m, void *v)
u64 now = ktime_to_ns(ktime_get());
int cpu;
- SEQ_printf(m, "Sched Debug Version: v0.08, %s %.*s\n",
+ SEQ_printf(m, "Sched Debug Version: v0.09, %s %.*s\n",
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version);
diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h
index a8f93dd..32d2bd4 100644
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
@@ -4,7 +4,7 @@
* bump this up when changing the output format or the meaning of an existing
* format, so that tools can adapt (or abort)
*/
-#define SCHEDSTAT_VERSION 14
+#define SCHEDSTAT_VERSION 15
static int show_schedstat(struct seq_file *seq, void *v)
{
@@ -26,9 +26,8 @@ static int show_schedstat(struct seq_file *seq, void *v)
/* runqueue-specific stats */
seq_printf(seq,
- "cpu%d %u %u %u %u %u %u %u %u %u %llu %llu %lu",
- cpu, rq->yld_both_empty,
- rq->yld_act_empty, rq->yld_exp_empty, rq->yld_count,
+ "cpu%d %u %u %u %u %u %u %llu %llu %lu",
+ cpu, rq->yld_count,
rq->sched_switch, rq->sched_count, rq->sched_goidle,
rq->ttwu_count, rq->ttwu_local,
rq->rq_cpu_time,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists