[PATCH] tracing/events: Use %pf in workqueue trace events

Anton Blanchard
2009-05-26T04:33:18Z

Using %pf instead of %pF supresses printing of the function offset
which will always be 0.

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: linux-2.6-master/include/trace/events/workqueue.h
===================================================================
--- linux-2.6-master.orig/include/trace/events/workqueue.h 2009-05-26 12:55:37.000000000 +1000
+++ linux-2.6-master/include/trace/events/workqueue.h 2009-05-26 12:55:44.000000000 +1000
@@ -32,7 +32,7 @@
__entry->cpu = cpu;
),

- TP_printk("thread=%s:%d func=%pF cpu=%d", __entry->thread_comm,
+ TP_printk("thread=%s:%d func=%pf cpu=%d", __entry->thread_comm,
__entry->thread_pid, __entry->func, __entry->cpu)
);

@@ -63,7 +63,7 @@
__entry->delay = delay;
),

- TP_printk("thread=%s:%d func=%pF cpu=%d delay=%lu",
+ TP_printk("thread=%s:%d func=%pf cpu=%d delay=%lu",
__entry->thread_comm, __entry->thread_pid, __entry->func,
__entry->cpu, __entry->delay)
);
@@ -88,7 +88,7 @@
__entry->func = work->func;
),

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

@@ -128,7 +128,7 @@
__entry->func = work->func;
),

- TP_printk("func=%pF", __entry->func)
+ TP_printk("func=%pf", __entry->func)
);

/* Trace the creation of one workqueue thread on a cpu */
Index: linux-2.6-master/Documentation/trace/workqueue.txt
===================================================================
--- linux-2.6-master.orig/Documentation/trace/workqueue.txt 2009-05-26 12:55:52.000000000 +1000
+++ linux-2.6-master/Documentation/trace/workqueue.txt 2009-05-26 12:56:14.000000000 +1000
@@ -107,8 +107,8 @@
# TASK-PID CPU# TIMESTAMP FUNCTION
# | | | | |

-<...>-5627 [000] 4597.858645: worklet_enqueue: thread=ata/0:508 func=ata_pio_task+0x0/0x280 cpu=0
-<...>-508 [000] 4597.858660: worklet_entry: thread=ata/0:508 work=ffff88007e9e67b8 func=ata_pio_task+0x0/0x280
+<...>-5627 [000] 4597.858645: worklet_enqueue: thread=ata/0:508 func=ata_pio_task cpu=0
+<...>-508 [000] 4597.858660: worklet_entry: thread=ata/0:508 work=ffff88007e9e67b8 func=ata_pio_task
<...>-508 [000] 4597.858684: worklet_exit: thread=ata/0:508 work=ffff88007e9e67b8
-<...>-2437 [000] 4597.861259: worklet_cancel: func=ata_pio_task+0x0/0x280
+<...>-2437 [000] 4597.861259: worklet_cancel: func=ata_pio_task …