]> nv-tegra.nvidia Code Review - linux-3.10.git/commit
tracing: Fix double CPP substitution in TRACE_EVENT_FN
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 27 Aug 2009 22:50:06 +0000 (00:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 28 Aug 2009 11:55:04 +0000 (13:55 +0200)
commit0dd7b74787eaf7858c6c573353a83c3e2766e674
tree110fd833b620a60e34aa00aaf316f8fd80ee7f86
parent66c6e29f24a50173fc1e761c3e2483c8d64e3b1a
tracing: Fix double CPP substitution in TRACE_EVENT_FN

TRACE_EVENT_FN relays on TRACE_EVENT by reprocessing its parameters
into the ftrace events CPP macro. This leads to a double substitution
in some cases.

For example, a bad consequence is a format always prefixed by
"%s, %s\n" for every TRACE_EVENT_FN based events.

Eg:
cat /debug/tracing/events/syscalls/sys_enter/format
[...]
print fmt: "%s, %s\n", "\"NR %ld (%lx, %lx, %lx, %lx, %lx, %lx)\"",\
"REC->id, REC->args[0], REC->args[1], REC->args[2], REC->args[3],\
REC->args[4], REC->args[5]"

This creates a failure in post-processing tools such as perf trace or
trace-cmd.

Then drop this double substitution and replace it by a new __cpparg()
macro that relays CPP arguments containing commas.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Josh Stone <jistone@redhat.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Jason Baron <jbaron@redhat.com>
LKML-Reference: <1251413406-6704-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/trace/ftrace.h