Commit 75ec29ab authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: Convert some sched trace events to DEFINE_EVENT and _PRINT 



Converting some of the scheduler trace events to use the
TRACE_EVENT_TEMPLATE, DEFINE_EVENT and DEFINE_EVENT_PRINT helped to
save some space:

$ size kernel/sched.o-*
   text	   data	    bss	    dec	    hex	filename
  79299	   6776	   2520	  88595	  15a13	kernel/sched.o-notrace
 101941	  11896	   2584	 116421	  1c6c5	kernel/sched.o-templ
 104779	  11896	   2584	 119259	  1d1db	kernel/sched.o-trace

sched.o-notrace is without any tracepoints compiled
sched.o-templ is with this patch
sched.o-trace is the tracepoints before this patch

The trace events converted to DEFINE_EVENT:

sched_wakeup, sched_wakeup_new, sched_process_free, sched_process_exit,
and sched_stat_wait.

The trace events converted to DEFINE_EVENT_PRINT:

sched_stat_sleep and sched_stat_iowait.

Note, since the TRACE_EVENT_TEMPLATE always uses a print, the
sched_stat_wait print format is defined in the template and this
template is used by sched_stat_sleep and sched_stat_iowait. But the
later two override the print format.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent e5bc9721

include/trace/events/sched.h

+52 −118
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ TRACE_EVENT(sched_wait_task, 
 * (NOTE: the 'rq' argument is not used by generic trace events,

 *        but used by the latency tracer plugin. )

 */

TRACE_EVENT(sched_wakeup,

TRACE_EVENT_TEMPLATE(sched_wakeup_template,



	TP_PROTO(struct rq *rq, struct task_struct *p, int success),
@@ -110,38 +110,19 @@ TRACE_EVENT(sched_wakeup, 
		  __entry->success, __entry->target_cpu)

);



DEFINE_EVENT(sched_wakeup_template, sched_wakeup,

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

	     TP_ARGS(rq, p, success));



/*

 * Tracepoint for waking up a new task:

 *

 * (NOTE: the 'rq' argument is not used by generic trace events,

 *        but used by the latency tracer plugin. )

 */

TRACE_EVENT(sched_wakeup_new,



DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,

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



	TP_ARGS(rq, p, success),



	TP_STRUCT__entry(

		__array(	char,	comm,	TASK_COMM_LEN	)

		__field(	pid_t,	pid			)

		__field(	int,	prio			)

		__field(	int,	success			)

		__field(	int,	target_cpu		)

	),



	TP_fast_assign(

		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);

		__entry->pid		= p->pid;

		__entry->prio		= p->prio;

		__entry->success	= success;

		__entry->target_cpu	= task_cpu(p);

	),



	TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d",

		  __entry->comm, __entry->pid, __entry->prio,

		  __entry->success, __entry->target_cpu)

);

	     TP_ARGS(rq, p, success));



/*

 * Tracepoint for task switches, performed by the scheduler:
@@ -216,10 +197,7 @@ TRACE_EVENT(sched_migrate_task, 
		  __entry->orig_cpu, __entry->dest_cpu)

);



/*

 * Tracepoint for freeing a task:

 */

TRACE_EVENT(sched_process_free,

TRACE_EVENT_TEMPLATE(sched_process_template,



	TP_PROTO(struct task_struct *p),
@@ -242,29 +220,19 @@ TRACE_EVENT(sched_process_free, 
);



/*

 * Tracepoint for a task exiting:

 * Tracepoint for freeing a task:

 */

TRACE_EVENT(sched_process_exit,



DEFINE_EVENT(sched_process_template, sched_process_free,

	     TP_PROTO(struct task_struct *p),

	     TP_ARGS(p));

	     

	TP_ARGS(p),



	TP_STRUCT__entry(

		__array(	char,	comm,	TASK_COMM_LEN	)

		__field(	pid_t,	pid			)

		__field(	int,	prio			)

	),



	TP_fast_assign(

		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);

		__entry->pid		= p->pid;

		__entry->prio		= p->prio;

	),



	TP_printk("comm=%s pid=%d prio=%d",

		  __entry->comm, __entry->pid, __entry->prio)

);

/*

 * Tracepoint for a task exiting:

 */

DEFINE_EVENT(sched_process_template, sched_process_exit,

	     TP_PROTO(struct task_struct *p),

	     TP_ARGS(p));



/*

 * Tracepoint for a waiting task:
@@ -348,12 +316,7 @@ TRACE_EVENT(sched_signal_send, 
 * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE

 *     adding sched_stat support to SCHED_FIFO/RR would be welcome.

 */



/*

 * Tracepoint for accounting wait time (time the task is runnable

 * but not actually running due to scheduler contention).

 */

TRACE_EVENT(sched_stat_wait,

TRACE_EVENT_TEMPLATE(sched_stat_template,



	TP_PROTO(struct task_struct *tsk, u64 delay),
@@ -379,97 +342,68 @@ TRACE_EVENT(sched_stat_wait, 
			(unsigned long long)__entry->delay)

);





/*

 * Tracepoint for accounting runtime (time the task is executing

 * on a CPU).

 * Tracepoint for accounting wait time (time the task is runnable

 * but not actually running due to scheduler contention).

 */

TRACE_EVENT(sched_stat_runtime,



	TP_PROTO(struct task_struct *tsk, u64 runtime, u64 vruntime),



	TP_ARGS(tsk, runtime, vruntime),



	TP_STRUCT__entry(

		__array( char,	comm,	TASK_COMM_LEN	)

		__field( pid_t,	pid			)

		__field( u64,	runtime			)

		__field( u64,	vruntime			)

	),



	TP_fast_assign(

		memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);

		__entry->pid		= tsk->pid;

		__entry->runtime	= runtime;

		__entry->vruntime	= vruntime;

	)

	TP_perf_assign(

		__perf_count(runtime);

	),



	TP_printk("comm=%s pid=%d runtime=%Lu [ns] vruntime=%Lu [ns]",

			__entry->comm, __entry->pid,

			(unsigned long long)__entry->runtime,

			(unsigned long long)__entry->vruntime)

);

DEFINE_EVENT(sched_stat_template, sched_stat_wait,

	     TP_PROTO(struct task_struct *tsk, u64 delay),

	     TP_ARGS(tsk, delay));



/*

 * Tracepoint for accounting sleep time (time the task is not runnable,

 * including iowait, see below).

 */

TRACE_EVENT(sched_stat_sleep,



DEFINE_EVENT_PRINT(sched_stat_template, sched_stat_sleep,

		   TP_PROTO(struct task_struct *tsk, u64 delay),



		   TP_ARGS(tsk, delay),



	TP_STRUCT__entry(

		__array( char,	comm,	TASK_COMM_LEN	)

		__field( pid_t,	pid			)

		__field( u64,	delay			)

	),



	TP_fast_assign(

		memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);

		__entry->pid	= tsk->pid;

		__entry->delay	= delay;

	)

	TP_perf_assign(

		__perf_count(delay);

	),



	TP_printk("comm=%s pid=%d delay=%Lu [ns]",

		   TP_printk("task: %s:%d sleep: %Lu [ns]",

			     __entry->comm, __entry->pid,

			(unsigned long long)__entry->delay)

);

			     (unsigned long long)__entry->delay));



/*

 * Tracepoint for accounting iowait time (time the task is not runnable

 * due to waiting on IO to complete).

 */

TRACE_EVENT(sched_stat_iowait,



DEFINE_EVENT_PRINT(sched_stat_template, sched_stat_iowait,

		   TP_PROTO(struct task_struct *tsk, u64 delay),



		   TP_ARGS(tsk, delay),

		   TP_printk("task: %s:%d iowait: %Lu [ns]",

			     __entry->comm, __entry->pid,

			     (unsigned long long)__entry->delay));



/*

 * Tracepoint for accounting runtime (time the task is executing

 * on a CPU).

 */

TRACE_EVENT(sched_stat_runtime,



	TP_PROTO(struct task_struct *tsk, u64 runtime, u64 vruntime),



	TP_ARGS(tsk, runtime, vruntime),



	TP_STRUCT__entry(

		__array( char,	comm,	TASK_COMM_LEN	)

		__field( pid_t,	pid			)

		__field( u64,	delay			)

		__field( u64,	runtime			)

		__field( u64,	vruntime			)

	),



	TP_fast_assign(

		memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);

		__entry->pid		= tsk->pid;

		__entry->delay	= delay;

		__entry->runtime	= runtime;

		__entry->vruntime	= vruntime;

	)

	TP_perf_assign(

		__perf_count(delay);

		__perf_count(runtime);

	),



	TP_printk("comm=%s pid=%d delay=%Lu [ns]",

	TP_printk("comm=%s pid=%d runtime=%Lu [ns] vruntime=%Lu [ns]",

			__entry->comm, __entry->pid,

			(unsigned long long)__entry->delay)

			(unsigned long long)__entry->runtime,

			(unsigned long long)__entry->vruntime)

);



#endif /* _TRACE_SCHED_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE