Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acdb2c28 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/ftrace' of... 

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
parents e9abf4c5 f2034f1e

include/linux/tracepoint.h

+3 −0
Original line number Diff line number Diff line
@@ -157,4 +157,7 @@ static inline void tracepoint_synchronize_unregister(void) 
#define TRACE_FORMAT(name, proto, args, fmt)		\

	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))



#define TRACE_EVENT_FORMAT(name, proto, args, fmt, struct, tpfmt)	\

	TRACE_FORMAT(name, PARAMS(proto), PARAMS(args), PARAMS(fmt))



#endif

include/trace/irq_event_types.h

+20 −4
Original line number Diff line number Diff line
@@ -5,13 +5,29 @@ 
# error Unless you know what you are doing.

#endif



TRACE_FORMAT(irq_handler_entry,

#undef TRACE_SYSTEM

#define TRACE_SYSTEM irq



TRACE_EVENT_FORMAT(irq_handler_entry,

	TPPROTO(int irq, struct irqaction *action),

	TPARGS(irq, action),

	TPFMT("irq=%d handler=%s", irq, action->name));

	TPFMT("irq=%d handler=%s", irq, action->name),

	TRACE_STRUCT(

		TRACE_FIELD(int, irq, irq)

	),

	TPRAWFMT("irq %d")

	);



TRACE_FORMAT(irq_handler_exit,

TRACE_EVENT_FORMAT(irq_handler_exit,

	TPPROTO(int irq, struct irqaction *action, int ret),

	TPARGS(irq, action, ret),

	TPFMT("irq=%d handler=%s return=%s",

		irq, action->name, ret ? "handled" : "unhandled"));
 
		irq, action->name, ret ? "handled" : "unhandled"),

	TRACE_STRUCT(

		TRACE_FIELD(int, irq, irq)

		TRACE_FIELD(int, ret, ret)

	),

	TPRAWFMT("irq %d ret %d")

	);



#undef TRACE_SYSTEM

include/trace/sched_event_types.h

+99 −25
Original line number Diff line number Diff line 


/* use <trace/sched.h> instead */

#ifndef TRACE_FORMAT

#ifndef TRACE_EVENT_FORMAT

# error Do not include this file directly.

# error Unless you know what you are doing.

#endif



TRACE_FORMAT(sched_kthread_stop,

#undef TRACE_SYSTEM

#define TRACE_SYSTEM sched



TRACE_EVENT_FORMAT(sched_kthread_stop,

	TPPROTO(struct task_struct *t),

	TPARGS(t),

	TPFMT("task %s:%d", t->comm, t->pid));

	TPFMT("task %s:%d", t->comm, t->pid),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, t->pid)

	),

	TPRAWFMT("task %d")

	);



TRACE_FORMAT(sched_kthread_stop_ret,

TRACE_EVENT_FORMAT(sched_kthread_stop_ret,

	TPPROTO(int ret),

	TPARGS(ret),

	TPFMT("ret=%d", ret));

	TPFMT("ret=%d", ret),

	TRACE_STRUCT(

		TRACE_FIELD(int, ret, ret)

	),

	TPRAWFMT("ret=%d")

	);



TRACE_FORMAT(sched_wait_task,

TRACE_EVENT_FORMAT(sched_wait_task,

	TPPROTO(struct rq *rq, struct task_struct *p),

	TPARGS(rq, p),

	TPFMT("task %s:%d", p->comm, p->pid));

	TPFMT("task %s:%d", p->comm, p->pid),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, p->pid)

	),

	TPRAWFMT("task %d")

	);



TRACE_FORMAT(sched_wakeup,

TRACE_EVENT_FORMAT(sched_wakeup,

	TPPROTO(struct rq *rq, struct task_struct *p, int success),

	TPARGS(rq, p, success),

	TPFMT("task %s:%d %s",

	      p->comm, p->pid, success?"succeeded":"failed"));

	      p->comm, p->pid, success ? "succeeded" : "failed"),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, p->pid)

		TRACE_FIELD(int, success, success)

	),

	TPRAWFMT("task %d success=%d")

	);



TRACE_FORMAT(sched_wakeup_new,

TRACE_EVENT_FORMAT(sched_wakeup_new,

	TPPROTO(struct rq *rq, struct task_struct *p, int success),

	TPARGS(rq, p, success),

	TPFMT("task %s:%d",

	      p->comm, p->pid, success?"succeeded":"failed"));

	      p->comm, p->pid, success ? "succeeded" : "failed"),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, p->pid)

		TRACE_FIELD(int, success, success)

	),

	TPRAWFMT("task %d success=%d")

	);



TRACE_FORMAT(sched_switch,

TRACE_EVENT_FORMAT(sched_switch,

	TPPROTO(struct rq *rq, struct task_struct *prev,

		struct task_struct *next),

	TPARGS(rq, prev, next),

	TPFMT("task %s:%d ==> %s:%d",

	      prev->comm, prev->pid, next->comm, next->pid));

	      prev->comm, prev->pid, next->comm, next->pid),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, prev_pid, prev->pid)

		TRACE_FIELD(int, prev_prio, prev->prio)

		TRACE_FIELD(pid_t, next_pid, next->pid)

		TRACE_FIELD(int, next_prio, next->prio)

	),

	TPRAWFMT("prev %d:%d ==> next %d:%d")

	);



TRACE_FORMAT(sched_migrate_task,

TRACE_EVENT_FORMAT(sched_migrate_task,

	TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),

	TPARGS(p, orig_cpu, dest_cpu),

	TPFMT("task %s:%d from: %d  to: %d",

	      p->comm, p->pid, orig_cpu, dest_cpu));

	      p->comm, p->pid, orig_cpu, dest_cpu),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, p->pid)

		TRACE_FIELD(int, orig_cpu, orig_cpu)

		TRACE_FIELD(int, dest_cpu, dest_cpu)

	),

	TPRAWFMT("task %d  from: %d to: %d")

	);



TRACE_FORMAT(sched_process_free,

TRACE_EVENT_FORMAT(sched_process_free,

	TPPROTO(struct task_struct *p),

	TPARGS(p),

	TPFMT("task %s:%d", p->comm, p->pid));

	TPFMT("task %s:%d", p->comm, p->pid),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, p->pid)

	),

	TPRAWFMT("task %d")

	);



TRACE_FORMAT(sched_process_exit,

TRACE_EVENT_FORMAT(sched_process_exit,

	TPPROTO(struct task_struct *p),

	TPARGS(p),

	TPFMT("task %s:%d", p->comm, p->pid));

	TPFMT("task %s:%d", p->comm, p->pid),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, p->pid)

	),

	TPRAWFMT("task %d")

	);



TRACE_FORMAT(sched_process_wait,

TRACE_EVENT_FORMAT(sched_process_wait,

	TPPROTO(struct pid *pid),

	TPARGS(pid),

	TPFMT("pid %d", pid));

	TPFMT("pid %d", pid_nr(pid)),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, pid, pid_nr(pid))

	),

	TPRAWFMT("task %d")

	);



TRACE_FORMAT(sched_process_fork,

TRACE_EVENT_FORMAT(sched_process_fork,

	TPPROTO(struct task_struct *parent, struct task_struct *child),

	TPARGS(parent, child),

	TPFMT("parent %s:%d  child %s:%d",

	      parent->comm, parent->pid, child->comm, child->pid));

	      parent->comm, parent->pid, child->comm, child->pid),

	TRACE_STRUCT(

		TRACE_FIELD(pid_t, parent, parent->pid)

		TRACE_FIELD(pid_t, child, child->pid)

	),

	TPRAWFMT("parent %d  child %d")

	);



TRACE_FORMAT(sched_signal_send,

TRACE_EVENT_FORMAT(sched_signal_send,

	TPPROTO(int sig, struct task_struct *p),

	TPARGS(sig, p),

	TPFMT("sig: %d   task %s:%d", sig, p->comm, p->pid));
 
	TPFMT("sig: %d   task %s:%d", sig, p->comm, p->pid),

	TRACE_STRUCT(

		TRACE_FIELD(int, sig, sig)

		TRACE_FIELD(pid_t, pid, p->pid)

	),

	TPRAWFMT("sig: %d  task %d")

	);



#undef TRACE_SYSTEM

include/trace/trace_event_types.h

0 → 100644
+4 −0
Original line number Diff line number Diff line 
/* trace/<type>_event_types.h here */



#include <trace/sched_event_types.h>

#include <trace/irq_event_types.h>

include/trace/trace_events.h

0 → 100644
+4 −0
Original line number Diff line number Diff line 
/* trace/<type>.h here */



#include <trace/sched.h>

#include <trace/irq.h>