This patch adds hooks into the schedule switch tracing to
allow other latency traces to hook into the schedule switches.
Signed-off-by: Steven Rostedt <[EMAIL PROTECTED]>
---
lib/tracing/trace_sched_switch.c | 121 ++++++++++++++++++++++++++++++++++-----
lib/tracing/tracer.h | 14 ++++
2 files changed, 120 insertions(+), 15 deletions(-)
Index: linux-mcount.git/lib/tracing/tracer.h
===================================================================
--- linux-mcount.git.orig/lib/tracing/tracer.h 2008-01-18 23:16:28.000000000
-0500
+++ linux-mcount.git/lib/tracing/tracer.h 2008-01-18 23:24:55.000000000
-0500
@@ -110,4 +110,18 @@ static inline notrace int page_order(con
return ilog2(roundup_pow_of_two(nr_pages));
}
+#ifdef CONFIG_CONTEXT_SWITCH_TRACER
+typedef void (*tracer_switch_func_t)(struct tracing_trace *tr,
+ struct task_struct *prev,
+ struct task_struct *next);
+struct tracer_switch_ops {
+ tracer_switch_func_t func;
+ struct tracing_trace *tr;
+ struct tracer_switch_ops *next;
+};
+
+extern int register_tracer_switch(struct tracer_switch_ops *ops);
+extern int unregister_tracer_switch(struct tracer_switch_ops *ops);
+#endif /* CONFIG_CONTEXT_SWITCH_TRACER */
+
#endif /* _LINUX_MCOUNT_TRACER_H */
Index: linux-mcount.git/lib/tracing/trace_sched_switch.c
===================================================================
--- linux-mcount.git.orig/lib/tracing/trace_sched_switch.c 2008-01-18
23:16:28.000000000 -0500
+++ linux-mcount.git/lib/tracing/trace_sched_switch.c 2008-01-18
23:25:11.000000000 -0500
@@ -19,6 +19,7 @@ static DEFINE_PER_CPU(struct tracing_tra
static int trace_enabled __read_mostly;
static unsigned long trace_nr_entries = (16384UL);
+static DEFINE_SPINLOCK(sched_switch_func_lock);
static int __init set_nr_entries(char *str)
{
@@ -29,22 +30,118 @@ static int __init set_nr_entries(char *s
}
__setup("trace_ctx_entries=", set_nr_entries);
+static void notrace sched_switch_func(struct tracing_trace *tr,
+ struct task_struct *prev,
+ struct task_struct *next)
+{
+ struct tracing_trace_cpu *data;
+ unsigned long flags;
+ int cpu;
+
+ if (likely(!trace_enabled))
+ return;
+
+ raw_local_irq_save(flags);
+ cpu = raw_smp_processor_id();
+ data = tr->data[cpu];
+ atomic_inc(&data->disabled);
+
+ if (likely(atomic_read(&data->disabled) == 1))
+ tracing_sched_switch_trace(tr, data, prev, next, flags);
+
+ atomic_dec(&data->disabled);
+ raw_local_irq_restore(flags);
+}
+
+static struct tracer_switch_ops sched_switch_ops __read_mostly =
+{
+ .func = sched_switch_func,
+ .tr = &sched_switch_trace,
+};
+
+static tracer_switch_func_t tracer_switch_func __read_mostly =
+ sched_switch_func;
+
+static struct tracer_switch_ops *tracer_switch_func_ops __read_mostly =
+ &sched_switch_ops;
+
+static void notrace sched_switch_func_loop(struct tracing_trace *tr,
+ struct task_struct *prev,
+ struct task_struct *next)
+{
+ struct tracer_switch_ops *ops = tracer_switch_func_ops;
+
+ for (; ops != NULL; ops = ops->next)
+ ops->func(ops->tr, prev, next);
+}
+
+notrace int register_tracer_switch(struct tracer_switch_ops *ops)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&sched_switch_func_lock, flags);
+ ops->next = tracer_switch_func_ops;
+ smp_wmb();
+ tracer_switch_func_ops = ops;
+
+ if (ops->next == &sched_switch_ops)
+ tracer_switch_func = sched_switch_func_loop;
+
+ spin_unlock_irqrestore(&sched_switch_func_lock, flags);
+
+ return 0;
+}
+
+notrace int unregister_tracer_switch(struct tracer_switch_ops *ops)
+{
+ unsigned long flags;
+ struct tracer_switch_ops **p = &tracer_switch_func_ops;
+ int ret;
+
+ spin_lock_irqsave(&sched_switch_func_lock, flags);
+
+ /*
+ * If the sched_switch is the only one left, then
+ * only call that function.
+ */
+ if (*p == ops && ops->next == &sched_switch_ops) {
+ tracer_switch_func = sched_switch_func;
+ tracer_switch_func_ops = &sched_switch_ops;
+ goto out;
+ }
+
+ for (; *p != &sched_switch_ops; p = &(*p)->next)
+ if (*p == ops)
+ break;
+
+ if (*p != ops) {
+ ret = -1;
+ goto out;
+ }
+
+ *p = (*p)->next;
+
+ out:
+ spin_unlock_irqrestore(&sched_switch_func_lock, flags);
+
+ return 0;
+}
+
static notrace void sched_switch_callback(const struct marker *mdata,
void *private_data,
const char *format, ...)
{
struct tracing_trace *tr = mdata->private;
- struct tracing_trace_cpu *data;
struct task_struct *prev;
struct task_struct *next;
- unsigned long flags;
va_list ap;
- int cpu;
if (unlikely(atomic_read(&trace_record_cmdline)))
tracing_record_cmdline(current);
- if (likely(!trace_enabled))
+ /* short circuit all this if nothing's enabled */
+ if (likely(tracer_switch_func == sched_switch_func &&
+ !trace_enabled))
return;
va_start(ap, format);
@@ -52,17 +149,11 @@ static notrace void sched_switch_callbac
next = va_arg(ap, typeof(next));
va_end(ap);
-
- raw_local_irq_save(flags);
- cpu = raw_smp_processor_id();
- data = tr->data[cpu];
- atomic_inc(&data->disabled);
-
- if (likely(atomic_read(&data->disabled) == 1))
- tracing_sched_switch_trace(tr, data, prev, next, flags);
-
- atomic_dec(&data->disabled);
- raw_local_irq_restore(flags);
+ /*
+ * If tracer_switch_func only points to the local
+ * switch func, then it needs the tr passed to it.
+ */
+ tracer_switch_func(tr, prev, next);
}
static notrace void sched_switch_reset(struct tracing_trace *tr)
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
