From: tip-bot for Johannes Berg <johannes@sipsolutions.net>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
rostedt@goodmis.org, johannes@sipsolutions.net,
tglx@linutronix.de
Subject: [tip:tracing/urgent] tracing: Fix event format export
Date: Sat, 14 Nov 2009 10:18:40 GMT [thread overview]
Message-ID: <tip-811cb50baf63461ce0bdb234927046131fc7fa8b@git.kernel.org> (raw)
In-Reply-To: <20091113224009.GB23942@elte.hu>
Commit-ID: 811cb50baf63461ce0bdb234927046131fc7fa8b
Gitweb: http://git.kernel.org/tip/811cb50baf63461ce0bdb234927046131fc7fa8b
Author: Johannes Berg <johannes@sipsolutions.net>
AuthorDate: Fri, 13 Nov 2009 23:40:09 +0100
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Fri, 13 Nov 2009 22:20:34 -0500
tracing: Fix event format export
For some reason the export of the event print format to userspace
uses '#fmt' which breaks if the format string is anything but a plain
string, for example if it is built with macros then the macro names
are exported instead of their contents.
Use
"\"%s\"", fmt
instead of
"%s", #fmt
to export the string and not the way it is built.
For example, in net/mac80211/driver-trace.h for the trace event drv_start
there is:
TP_printk(
LOCAL_PR_FMT, LOCAL_PR_ARG
)
Which use to produce:
print fmt: LOCAL_PR_FMT, REC->wiphy_name
Now produces:
print fmt: "%s", REC->wiphy_name
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
LKML-Reference: <20091113224009.GB23942@elte.hu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/ftrace.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index cc0d966..dacb8ef 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -159,7 +159,7 @@
#undef __get_str
#undef TP_printk
-#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)
+#define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args)
#undef TP_fast_assign
#define TP_fast_assign(args...) args
next prev parent reply other threads:[~2009-11-14 10:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-13 12:37 [PATCH 2.6.32] ftrace: fix event format export Johannes Berg
2009-11-13 13:22 ` Andreas Schwab
2009-11-13 13:29 ` Johannes Berg
2009-11-13 13:32 ` Johannes Berg
2009-11-13 22:40 ` Ingo Molnar
2009-11-13 23:28 ` Steven Rostedt
2009-11-14 9:21 ` Johannes Berg
2009-11-14 4:12 ` [PATCH][GIT PULL][v2.6.32] tracing: Fix " Steven Rostedt
2009-11-14 9:39 ` Ingo Molnar
2009-11-14 10:18 ` tip-bot for Johannes Berg [this message]
2009-12-03 14:41 ` [tip:tracing/urgent] " Steven Rostedt
2009-12-03 14:55 ` Ingo Molnar
2009-12-06 16:19 ` Johannes Berg
2009-12-06 17:11 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-811cb50baf63461ce0bdb234927046131fc7fa8b@git.kernel.org \
--to=johannes@sipsolutions.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox