diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2009-11-26 02:08:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 03:14:05 -0500 |
commit | 470dda7417f284b9cfc96560b2acd98df63798a2 (patch) | |
tree | c24bd04ea87975a56d34f3a86c2d32c9350bc6a0 /include | |
parent | b5eb34c3592545c756e50d882c08417eb60740a7 (diff) |
tracing: Restore original format of sched events
The original format for sched_stat_iowait and sched_stat_sleep:
$ cat events/sched/sched_stat_iowait/format
...
print fmt: "comm=%s pid=%d delay=%Lu [ns]", ...
$ cat events/sched/sched_stat_sleep/format
...
print fmt: "comm=%s pid=%d delay=%Lu [ns]", ...
But commit commit 75ec29ab848a7e92a41aaafaeb33d1afbc839be4
("tracing: Convert some sched trace events to DEFINE_EVENT and
_PRINT") broke the format:
$ cat events/sched/sched_stat_iowait/format
print fmt: "task: %s:%d iowait: %Lu [ns]", ...
$ cat events/sched/sched_stat_sleep/format
print fmt: "task: %s:%d sleep: %Lu [ns]", ...
No change in functionality.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4B0E2951.9050800@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/trace/events/sched.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 5ce795021851..9d316b22388c 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h | |||
@@ -355,23 +355,17 @@ DEFINE_EVENT(sched_stat_template, sched_stat_wait, | |||
355 | * Tracepoint for accounting sleep time (time the task is not runnable, | 355 | * Tracepoint for accounting sleep time (time the task is not runnable, |
356 | * including iowait, see below). | 356 | * including iowait, see below). |
357 | */ | 357 | */ |
358 | DEFINE_EVENT_PRINT(sched_stat_template, sched_stat_sleep, | 358 | DEFINE_EVENT(sched_stat_template, sched_stat_sleep, |
359 | TP_PROTO(struct task_struct *tsk, u64 delay), | 359 | TP_PROTO(struct task_struct *tsk, u64 delay), |
360 | TP_ARGS(tsk, delay), | 360 | TP_ARGS(tsk, delay)); |
361 | TP_printk("task: %s:%d sleep: %Lu [ns]", | ||
362 | __entry->comm, __entry->pid, | ||
363 | (unsigned long long)__entry->delay)); | ||
364 | 361 | ||
365 | /* | 362 | /* |
366 | * Tracepoint for accounting iowait time (time the task is not runnable | 363 | * Tracepoint for accounting iowait time (time the task is not runnable |
367 | * due to waiting on IO to complete). | 364 | * due to waiting on IO to complete). |
368 | */ | 365 | */ |
369 | DEFINE_EVENT_PRINT(sched_stat_template, sched_stat_iowait, | 366 | DEFINE_EVENT(sched_stat_template, sched_stat_iowait, |
370 | TP_PROTO(struct task_struct *tsk, u64 delay), | 367 | TP_PROTO(struct task_struct *tsk, u64 delay), |
371 | TP_ARGS(tsk, delay), | 368 | TP_ARGS(tsk, delay)); |
372 | TP_printk("task: %s:%d iowait: %Lu [ns]", | ||
373 | __entry->comm, __entry->pid, | ||
374 | (unsigned long long)__entry->delay)); | ||
375 | 369 | ||
376 | /* | 370 | /* |
377 | * Tracepoint for accounting runtime (time the task is executing | 371 | * Tracepoint for accounting runtime (time the task is executing |