From: Masami Hiramatsu <mhiramat@redhat.com>
To: Ingo Molnar <mingo@elte.hu>, Steven Rostedt <rostedt@goodmis.org>,
lkml <linux-kernel@vger.kernel.org>
Cc: systemtap <systemtap@sources.redhat.com>,
kvm <kvm@vger.kernel.org>,
DLE <dle-develop@lists.sourceforge.net>,
Masami Hiramatsu <mhiramat@redhat.com>,
Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@elte.hu>,
Tom Zanussi <tzanussi@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH -tip -v12 07/11] tracing: Introduce TRACE_FIELD_ZERO() macro
Date: Thu, 16 Jul 2009 11:57:35 -0400 [thread overview]
Message-ID: <20090716155735.6266.77599.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090716155652.6266.39970.stgit@localhost.localdomain>
Use TRACE_FIELD_ZERO(type, item) instead of TRACE_FIELD_ZERO_CHAR(item).
This also includes a fix of TRACE_ZERO_CHAR() macro.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
---
kernel/trace/trace_event_types.h | 4 ++--
kernel/trace/trace_export.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/trace_event_types.h b/kernel/trace/trace_event_types.h
index 6db005e..e74f090 100644
--- a/kernel/trace/trace_event_types.h
+++ b/kernel/trace/trace_event_types.h
@@ -109,7 +109,7 @@ TRACE_EVENT_FORMAT(bprint, TRACE_BPRINT, bprint_entry, ignore,
TRACE_STRUCT(
TRACE_FIELD(unsigned long, ip, ip)
TRACE_FIELD(char *, fmt, fmt)
- TRACE_FIELD_ZERO_CHAR(buf)
+ TRACE_FIELD_ZERO(char, buf)
),
TP_RAW_FMT("%08lx (%d) fmt:%p %s")
);
@@ -117,7 +117,7 @@ TRACE_EVENT_FORMAT(bprint, TRACE_BPRINT, bprint_entry, ignore,
TRACE_EVENT_FORMAT(print, TRACE_PRINT, print_entry, ignore,
TRACE_STRUCT(
TRACE_FIELD(unsigned long, ip, ip)
- TRACE_FIELD_ZERO_CHAR(buf)
+ TRACE_FIELD_ZERO(char, buf)
),
TP_RAW_FMT("%08lx (%d) fmt:%p %s")
);
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 7cee79d..23125b5 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -42,9 +42,9 @@ extern void __bad_type_size(void);
if (!ret) \
return 0;
-#undef TRACE_FIELD_ZERO_CHAR
-#define TRACE_FIELD_ZERO_CHAR(item) \
- ret = trace_seq_printf(s, "\tfield:char " #item ";\t" \
+#undef TRACE_FIELD_ZERO
+#define TRACE_FIELD_ZERO(type, item) \
+ ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t" \
"offset:%u;\tsize:0;\n", \
(unsigned int)offsetof(typeof(field), item)); \
if (!ret) \
@@ -90,9 +90,6 @@ ftrace_format_##call(struct ftrace_event_call *dummy, struct trace_seq *s)\
#include "trace_event_types.h"
-#undef TRACE_ZERO_CHAR
-#define TRACE_ZERO_CHAR(arg)
-
#undef TRACE_FIELD
#define TRACE_FIELD(type, item, assign)\
entry->item = assign;
@@ -105,6 +102,9 @@ ftrace_format_##call(struct ftrace_event_call *dummy, struct trace_seq *s)\
#define TRACE_FIELD_SIGN(type, item, assign, is_signed) \
TRACE_FIELD(type, item, assign)
+#undef TRACE_FIELD_ZERO
+#define TRACE_FIELD_ZERO(type, item)
+
#undef TP_CMD
#define TP_CMD(cmd...) cmd
@@ -176,8 +176,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \
if (ret) \
return ret;
-#undef TRACE_FIELD_ZERO_CHAR
-#define TRACE_FIELD_ZERO_CHAR(item)
+#undef TRACE_FIELD_ZERO
+#define TRACE_FIELD_ZERO(type, item)
#undef TRACE_EVENT_FORMAT
#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: mhiramat@redhat.com
next prev parent reply other threads:[~2009-07-16 15:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-16 15:56 [PATCH -tip -v12 00/11] tracing: kprobe-based event tracer and x86 instruction decoder Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 01/11] x86: instruction decoder API Masami Hiramatsu
2009-07-16 16:19 ` H. Peter Anvin
2009-07-16 16:52 ` Masami Hiramatsu
2009-07-16 16:37 ` Sam Ravnborg
2009-07-16 17:28 ` Masami Hiramatsu
2009-07-16 20:00 ` Sam Ravnborg
2009-07-16 20:48 ` Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 02/11] x86: x86 instruction decoder build-time selftest Masami Hiramatsu
2009-07-16 16:29 ` Sam Ravnborg
2009-07-16 17:37 ` Masami Hiramatsu
2009-07-16 19:40 ` Masami Hiramatsu
2009-07-16 19:55 ` Sam Ravnborg
2009-07-16 20:16 ` Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 03/11] kprobes: checks probe address is instruction boudary on x86 Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 04/11] kprobes: cleanup fix_riprel() using insn decoder " Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 05/11] x86: add pt_regs register and stack access APIs Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 06/11] tracing: ftrace dynamic ftrace_event_call support Masami Hiramatsu
2009-07-16 15:57 ` Masami Hiramatsu [this message]
2009-07-16 15:57 ` [PATCH -tip -v12 08/11] tracing: add kprobe-based event tracer Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 09/11] tracing: Kprobe-tracer supports more than 6 arguments Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 10/11] tracing: Generate names for each kprobe event automatically Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 11/11] tracing: Add kprobes event profiling interface Masami Hiramatsu
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=20090716155735.6266.77599.stgit@localhost.localdomain \
--to=mhiramat@redhat.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=fweisbec@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=systemtap@sources.redhat.com \
--cc=tzanussi@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).