[PATCH 3/4][RFC] tracing: add schedule events to event trace

[Steven Rostedt <rostedt@goodmis.org>]

[-- Attachment #1: 0003-tracing-add-schedule-events-to-event-trace.patch --]
[-- Type: text/plain, Size: 5614 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

This patch changes the trace/sched.h to use the DECLARE_TRACE_FMT
such that they are automatically registered with the event tracer.

And it also adds the tracing sched headers to kernel/trace/events.c

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
 include/trace/sched.h             |   49 +------------------------
 include/trace/sched_event_types.h |   74 +++++++++++++++++++++++++++++++++++++
 kernel/trace/Makefile             |    1 +
 kernel/trace/events.c             |   13 ++++++
 4 files changed, 89 insertions(+), 48 deletions(-)
 create mode 100644 include/trace/sched_event_types.h
 create mode 100644 kernel/trace/events.c

diff --git a/include/trace/sched.h b/include/trace/sched.h
index 0d81098..4e372a1 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -4,53 +4,6 @@
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
 
-DECLARE_TRACE(sched_kthread_stop,
-	TPPROTO(struct task_struct *t),
-		TPARGS(t));
-
-DECLARE_TRACE(sched_kthread_stop_ret,
-	TPPROTO(int ret),
-		TPARGS(ret));
-
-DECLARE_TRACE(sched_wait_task,
-	TPPROTO(struct rq *rq, struct task_struct *p),
-		TPARGS(rq, p));
-
-DECLARE_TRACE(sched_wakeup,
-	TPPROTO(struct rq *rq, struct task_struct *p, int success),
-		TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_wakeup_new,
-	TPPROTO(struct rq *rq, struct task_struct *p, int success),
-		TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_switch,
-	TPPROTO(struct rq *rq, struct task_struct *prev,
-		struct task_struct *next),
-		TPARGS(rq, prev, next));
-
-DECLARE_TRACE(sched_migrate_task,
-	TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
-		TPARGS(p, orig_cpu, dest_cpu));
-
-DECLARE_TRACE(sched_process_free,
-	TPPROTO(struct task_struct *p),
-		TPARGS(p));
-
-DECLARE_TRACE(sched_process_exit,
-	TPPROTO(struct task_struct *p),
-		TPARGS(p));
-
-DECLARE_TRACE(sched_process_wait,
-	TPPROTO(struct pid *pid),
-		TPARGS(pid));
-
-DECLARE_TRACE(sched_process_fork,
-	TPPROTO(struct task_struct *parent, struct task_struct *child),
-		TPARGS(parent, child));
-
-DECLARE_TRACE(sched_signal_send,
-	TPPROTO(int sig, struct task_struct *p),
-		TPARGS(sig, p));
+#include <trace/sched_event_types.h>
 
 #endif
diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
new file mode 100644
index 0000000..da81d4d
--- /dev/null
+++ b/include/trace/sched_event_types.h
@@ -0,0 +1,74 @@
+
+/* use <trace/sched.h> instead */
+#ifndef DECLARE_TRACE_FMT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+DECLARE_TRACE_FMT(sched_kthread_stop,
+	TPPROTO(struct task_struct *t),
+		  TPARGS(t),
+		   "task %s:%d", TPARGS(t->comm, t->pid));
+
+DECLARE_TRACE_FMT(sched_kthread_stop_ret,
+	TPPROTO(int ret),
+		  TPARGS(ret),
+		   "ret=%d", TPARGS(ret));
+
+DECLARE_TRACE_FMT(sched_wait_task,
+	TPPROTO(struct rq *rq, struct task_struct *p),
+		  TPARGS(rq, p),
+		   "task %s:%d", TPARGS(p->comm, p->pid));
+
+DECLARE_TRACE_FMT(sched_wakeup,
+	TPPROTO(struct rq *rq, struct task_struct *p, int success),
+		  TPARGS(rq, p, success),
+		   "task %s:%d %s",
+		   TPARGS(p->comm, p->pid, success?"succeeded":"failed"));
+
+DECLARE_TRACE_FMT(sched_wakeup_new,
+	TPPROTO(struct rq *rq, struct task_struct *p, int success),
+		  TPARGS(rq, p, success),
+		   "task %s:%d",
+		   TPARGS(p->comm, p->pid, success?"succeeded":"failed"));
+
+DECLARE_TRACE_FMT(sched_switch,
+	TPPROTO(struct rq *rq, struct task_struct *prev,
+		struct task_struct *next),
+		  TPARGS(rq, prev, next),
+		   "task %s:%d ==> %s:%d", TPARGS(prev->comm, prev->pid,
+						  next->comm, next->pid));
+
+DECLARE_TRACE_FMT(sched_migrate_task,
+	TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
+		  TPARGS(p, orig_cpu, dest_cpu),
+		   "task %s:%d from: %d  to: %d",
+		   TPARGS(p->comm, p->pid, orig_cpu, dest_cpu));
+
+DECLARE_TRACE_FMT(sched_process_free,
+	TPPROTO(struct task_struct *p),
+		  TPARGS(p),
+		   "task %s:%d", TPARGS(p->comm, p->pid));
+
+DECLARE_TRACE_FMT(sched_process_exit,
+	TPPROTO(struct task_struct *p),
+		  TPARGS(p),
+		   "task %s:%d", TPARGS(p->comm, p->pid));
+
+DECLARE_TRACE_FMT(sched_process_wait,
+	TPPROTO(struct pid *pid),
+		  TPARGS(pid),
+		   "pid %d", TPARGS(pid));
+
+DECLARE_TRACE_FMT(sched_process_fork,
+	TPPROTO(struct task_struct *parent, struct task_struct *child),
+		  TPARGS(parent, child),
+		   "parent %s:%d  child %s:%d",
+		   TPARGS(parent->comm, parent->pid,
+			  child->comm, child->pid));
+
+DECLARE_TRACE_FMT(sched_signal_send,
+	TPPROTO(int sig, struct task_struct *p),
+		  TPARGS(sig, p),
+		   "sig: %d   task %s:%d",
+		   TPARGS(sig, p->comm, p->pid));
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index c736356..664b6c0 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -39,5 +39,6 @@ obj-$(CONFIG_KMEMTRACE) += kmemtrace.o
 obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o
 obj-$(CONFIG_BLK_DEV_IO_TRACE)	+= blktrace.o
 obj-$(CONFIG_EVENT_TRACER) += trace_events.o
+obj-$(CONFIG_EVENT_TRACER) += events.o
 
 libftrace-y := ftrace.o
diff --git a/kernel/trace/events.c b/kernel/trace/events.c
new file mode 100644
index 0000000..38c89ee
--- /dev/null
+++ b/kernel/trace/events.c
@@ -0,0 +1,13 @@
+/*
+ * This is the place to register all trace points as events.
+ * Include the trace/<type>.h at the top.
+ * Include the trace/<type>_event_types.h at the bottom.
+ */
+
+/* trace/<type>.h here */
+#include <trace/sched.h>
+
+#include "trace_events.h"
+
+/* trace/<type>_event_types.h here */
+#include <trace/sched_event_types.h>
-- 
1.5.6.5

--