sched: remove wait_runtime fields and features

[linux-2.6] / kernel / sched_debug.c

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 87e524762b858725207b540c2f4e51a2f230fde3..e3b62324ac3130dce15eeeaa7b4e47a7388ed2ab 100644 (file)
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -36,20 +36,16 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
        else
                SEQ_printf(m, " ");
 
-       SEQ_printf(m, "%15s %5d %15Ld %13Ld %13Ld %9Ld %5d ",
+       SEQ_printf(m, "%15s %5d %15Ld %13Ld %5d ",
                p->comm, p->pid,
                (long long)p->se.fair_key,
-               (long long)(p->se.fair_key - rq->cfs.fair_clock),
-               (long long)p->se.wait_runtime,
                (long long)(p->nvcsw + p->nivcsw),
                p->prio);
 #ifdef CONFIG_SCHEDSTATS
-       SEQ_printf(m, "%15Ld %15Ld %15Ld %15Ld %15Ld\n",
+       SEQ_printf(m, "%15Ld %15Ld %15Ld\n",
+               (long long)p->se.vruntime,
                (long long)p->se.sum_exec_runtime,
-               (long long)p->se.sum_wait_runtime,
-               (long long)p->se.sum_sleep_runtime,
-               (long long)p->se.wait_runtime_overruns,
-               (long long)p->se.wait_runtime_underruns);
+               (long long)p->se.sum_sleep_runtime);
 #else
        SEQ_printf(m, "%15Ld %15Ld %15Ld %15Ld %15Ld\n",
                0LL, 0LL, 0LL, 0LL, 0LL);
@@ -62,12 +58,10 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
 
        SEQ_printf(m,
        "\nrunnable tasks:\n"
-       "            task   PID        tree-key         delta       waiting"
-       "  switches  prio"
-       "        sum-exec        sum-wait       sum-sleep"
-       "    wait-overrun   wait-underrun\n"
+       "            task   PID        tree-key  switches  prio"
+       "    exec-runtime        sum-exec       sum-sleep\n"
        "------------------------------------------------------------------"
-       "----------------"
+       "--------------------------------"
        "------------------------------------------------"
        "--------------------------------\n");
 
@@ -83,45 +77,43 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
        read_unlock_irq(&tasklist_lock);
 }
 
-static void
-print_cfs_rq_runtime_sum(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
+void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 {
-       s64 wait_runtime_rq_sum = 0;
-       struct task_struct *p;
-       struct rb_node *curr;
-       unsigned long flags;
+       s64 MIN_vruntime = -1, min_vruntime, max_vruntime = -1,
+               spread, rq0_min_vruntime, spread0;
        struct rq *rq = &per_cpu(runqueues, cpu);
+       struct sched_entity *last;
+       unsigned long flags;
 
-       spin_lock_irqsave(&rq->lock, flags);
-       curr = first_fair(cfs_rq);
-       while (curr) {
-               p = rb_entry(curr, struct task_struct, se.run_node);
-               wait_runtime_rq_sum += p->se.wait_runtime;
-
-               curr = rb_next(curr);
-       }
-       spin_unlock_irqrestore(&rq->lock, flags);
-
-       SEQ_printf(m, "  .%-30s: %Ld\n", "wait_runtime_rq_sum",
-               (long long)wait_runtime_rq_sum);
-}
-
-void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
-{
        SEQ_printf(m, "\ncfs_rq\n");
 
 #define P(x) \
        SEQ_printf(m, "  .%-30s: %Ld\n", #x, (long long)(cfs_rq->x))
 
-       P(fair_clock);
        P(exec_clock);
-       P(wait_runtime);
-       P(wait_runtime_overruns);
-       P(wait_runtime_underruns);
-       P(sleeper_bonus);
-#undef P
 
-       print_cfs_rq_runtime_sum(m, cpu, cfs_rq);
+       spin_lock_irqsave(&rq->lock, flags);
+       if (cfs_rq->rb_leftmost)
+               MIN_vruntime = (__pick_next_entity(cfs_rq))->vruntime;
+       last = __pick_last_entity(cfs_rq);
+       if (last)
+               max_vruntime = last->vruntime;
+       min_vruntime = rq->cfs.min_vruntime;
+       rq0_min_vruntime = per_cpu(runqueues, 0).cfs.min_vruntime;
+       spin_unlock_irqrestore(&rq->lock, flags);
+       SEQ_printf(m, "  .%-30s: %Ld\n", "MIN_vruntime",
+                       (long long)MIN_vruntime);
+       SEQ_printf(m, "  .%-30s: %Ld\n", "min_vruntime",
+                       (long long)min_vruntime);
+       SEQ_printf(m, "  .%-30s: %Ld\n", "max_vruntime",
+                       (long long)max_vruntime);
+       spread = max_vruntime - MIN_vruntime;
+       SEQ_printf(m, "  .%-30s: %Ld\n", "spread",
+                       (long long)spread);
+       spread0 = min_vruntime - rq0_min_vruntime;
+       SEQ_printf(m, "  .%-30s: %Ld\n", "spread0",
+                       (long long)spread0);
+#undef P
 }
 
 static void print_cpu(struct seq_file *m, int cpu)
@@ -144,9 +136,7 @@ static void print_cpu(struct seq_file *m, int cpu)
 
        P(nr_running);
        SEQ_printf(m, "  .%-30s: %lu\n", "load",
-                  rq->ls.load.weight);
-       P(ls.delta_fair);
-       P(ls.delta_exec);
+                  rq->load.weight);
        P(nr_switches);
        P(nr_load_updates);
        P(nr_uninterruptible);
@@ -154,10 +144,11 @@ static void print_cpu(struct seq_file *m, int cpu)
        P(next_balance);
        P(curr->pid);
        P(clock);
+       P(idle_clock);
        P(prev_clock_raw);
        P(clock_warps);
        P(clock_overflows);
-       P(clock_unstable_events);
+       P(clock_deep_idle_events);
        P(clock_max_delta);
        P(cpu_load[0]);
        P(cpu_load[1]);
@@ -240,10 +231,8 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
 #define P(F) \
        SEQ_printf(m, "%-25s:%20Ld\n", #F, (long long)p->F)
 
-       P(se.wait_runtime);
-       P(se.wait_start_fair);
        P(se.exec_start);
-       P(se.sleep_start_fair);
+       P(se.vruntime);
        P(se.sum_exec_runtime);
 
 #ifdef CONFIG_SCHEDSTATS
@@ -253,10 +242,8 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
        P(se.sleep_max);
        P(se.block_max);
        P(se.exec_max);
+       P(se.slice_max);
        P(se.wait_max);
-       P(se.wait_runtime_overruns);
-       P(se.wait_runtime_underruns);
-       P(se.sum_wait_runtime);
 #endif
        SEQ_printf(m, "%-25s:%20Ld\n",
                   "nr_switches", (long long)(p->nvcsw + p->nivcsw));
@@ -278,8 +265,12 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
 void proc_sched_set_task(struct task_struct *p)
 {
 #ifdef CONFIG_SCHEDSTATS
-       p->se.sleep_max = p->se.block_max = p->se.exec_max = p->se.wait_max = 0;
-       p->se.wait_runtime_overruns = p->se.wait_runtime_underruns = 0;
+       p->se.sleep_max                 = 0;
+       p->se.block_max                 = 0;
+       p->se.exec_max                  = 0;
+       p->se.slice_max                 = 0;
+       p->se.wait_max                  = 0;
 #endif
-       p->se.sum_exec_runtime = 0;
+       p->se.sum_exec_runtime          = 0;
+       p->se.prev_sum_exec_runtime     = 0;
 }