tracing/filters: Don't use pred on alloc failure

[safe/jmp/linux-2.6] / kernel / trace / trace_sched_switch.c

diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index be35bdf..a98106d 100644 (file)
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -10,7 +10,7 @@
 #include <linux/kallsyms.h>
 #include <linux/uaccess.h>
 #include <linux/ftrace.h>
-#include <trace/sched.h>
+#include <trace/events/sched.h>
 
 #include "trace.h"
 
@@ -18,6 +18,7 @@ static struct trace_array     *ctx_trace;
 static int __read_mostly       tracer_enabled;
 static int                     sched_ref;
 static DEFINE_MUTEX(sched_register_mutex);
+static int                     sched_stopped;
 
 static void
 probe_sched_switch(struct rq *__rq, struct task_struct *prev,
@@ -28,13 +29,13 @@ probe_sched_switch(struct rq *__rq, struct task_struct *prev,
        int cpu;
        int pc;
 
-       if (!sched_ref)
+       if (unlikely(!sched_ref))
                return;
 
        tracing_record_cmdline(prev);
        tracing_record_cmdline(next);
 
-       if (!tracer_enabled)
+       if (!tracer_enabled || sched_stopped)
                return;
 
        pc = preempt_count();
@@ -43,45 +44,38 @@ probe_sched_switch(struct rq *__rq, struct task_struct *prev,
        data = ctx_trace->data[cpu];
 
        if (likely(!atomic_read(&data->disabled)))
-               tracing_sched_switch_trace(ctx_trace, data, prev, next, flags, pc);
+               tracing_sched_switch_trace(ctx_trace, prev, next, flags, pc);
 
        local_irq_restore(flags);
 }
 
 static void
-probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee)
+probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee, int success)
 {
        struct trace_array_cpu *data;
        unsigned long flags;
        int cpu, pc;
 
-       if (!likely(tracer_enabled))
+       if (unlikely(!sched_ref))
                return;
 
-       pc = preempt_count();
        tracing_record_cmdline(current);
 
+       if (!tracer_enabled || sched_stopped)
+               return;
+
+       pc = preempt_count();
        local_irq_save(flags);
        cpu = raw_smp_processor_id();
        data = ctx_trace->data[cpu];
 
        if (likely(!atomic_read(&data->disabled)))
-               tracing_sched_wakeup_trace(ctx_trace, data, wakee, current,
+               tracing_sched_wakeup_trace(ctx_trace, wakee, current,
                                           flags, pc);
 
        local_irq_restore(flags);
 }
 
-static void sched_switch_reset(struct trace_array *tr)
-{
-       int cpu;
-
-       tr->time_start = ftrace_now(tr->cpu);
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-}
-
 static int tracing_sched_register(void)
 {
        int ret;
@@ -103,7 +97,7 @@ static int tracing_sched_register(void)
        ret = register_trace_sched_switch(probe_sched_switch);
        if (ret) {
                pr_info("sched trace: Couldn't activate tracepoint"
-                       " probe to kernel_sched_schedule\n");
+                       " probe to kernel_sched_switch\n");
                goto fail_deprobe_wake_new;
        }
 
@@ -195,21 +189,17 @@ void tracing_sched_switch_assign_trace(struct trace_array *tr)
        ctx_trace = tr;
 }
 
-static void start_sched_trace(struct trace_array *tr)
-{
-       sched_switch_reset(tr);
-       tracing_start_sched_switch_record();
-}
-
 static void stop_sched_trace(struct trace_array *tr)
 {
        tracing_stop_sched_switch_record();
 }
 
-static void sched_switch_trace_init(struct trace_array *tr)
+static int sched_switch_trace_init(struct trace_array *tr)
 {
        ctx_trace = tr;
-       start_sched_trace(tr);
+       tracing_reset_online_cpus(tr);
+       tracing_start_sched_switch_record();
+       return 0;
 }
 
 static void sched_switch_trace_reset(struct trace_array *tr)
@@ -220,13 +210,12 @@ static void sched_switch_trace_reset(struct trace_array *tr)
 
 static void sched_switch_trace_start(struct trace_array *tr)
 {
-       sched_switch_reset(tr);
-       tracing_start_sched_switch();
+       sched_stopped = 0;
 }
 
 static void sched_switch_trace_stop(struct trace_array *tr)
 {
-       tracing_stop_sched_switch();
+       sched_stopped = 1;
 }
 
 static struct tracer sched_switch_trace __read_mostly =
@@ -236,6 +225,7 @@ static struct tracer sched_switch_trace __read_mostly =
        .reset          = sched_switch_trace_reset,
        .start          = sched_switch_trace_start,
        .stop           = sched_switch_trace_stop,
+       .wait_pipe      = poll_wait_pipe,
 #ifdef CONFIG_FTRACE_SELFTEST
        .selftest    = trace_selftest_startup_sched_switch,
 #endif
@@ -246,3 +236,4 @@ __init static int init_sched_switch_trace(void)
        return register_tracer(&sched_switch_trace);
 }
 device_initcall(init_sched_switch_trace);
+