Skip to content

Commit

Permalink
tracing: Convert some workqueue events to DEFINE_EVENT
Browse files Browse the repository at this point in the history
Use DECLARE_EVENT_CLASS to remove duplicate code:

   text    data     bss     dec     hex filename
  13171     800      72   14043    36db kernel/workqueue.o.old
  12243     800      68   13111    3337 kernel/workqueue.o

Two events are converted:

  workqueue: workqueue_insertion, workqueue_execution

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: <4B0E289F.5010104@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Li Zefan authored and Ingo Molnar committed Nov 26, 2009
1 parent c467307 commit 382ece7
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions include/trace/events/workqueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <linux/sched.h>
#include <linux/tracepoint.h>

TRACE_EVENT(workqueue_insertion,
DECLARE_EVENT_CLASS(workqueue,

TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),

Expand All @@ -30,26 +30,18 @@ TRACE_EVENT(workqueue_insertion,
__entry->thread_pid, __entry->func)
);

TRACE_EVENT(workqueue_execution,
DEFINE_EVENT(workqueue, workqueue_insertion,

TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),

TP_ARGS(wq_thread, work),
TP_ARGS(wq_thread, work)
);

TP_STRUCT__entry(
__array(char, thread_comm, TASK_COMM_LEN)
__field(pid_t, thread_pid)
__field(work_func_t, func)
),
DEFINE_EVENT(workqueue, workqueue_execution,

TP_fast_assign(
memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
__entry->thread_pid = wq_thread->pid;
__entry->func = work->func;
),
TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),

TP_printk("thread=%s:%d func=%pf", __entry->thread_comm,
__entry->thread_pid, __entry->func)
TP_ARGS(wq_thread, work)
);

/* Trace the creation of one workqueue thread on a cpu */
Expand Down

0 comments on commit 382ece7

Please sign in to comment.