* [PATCH] tracing/syscalls: Fix the output of syscalls with no arguments [not found] <4A8CAE0C.9040107@cn.fujitsu.com> @ 2009-08-20 8:13 ` Li Zefan 2009-08-20 10:54 ` [tip:tracing/core] " tip-bot for Li Zefan 2009-08-20 11:34 ` [PATCH] " Frederic Weisbecker 0 siblings, 2 replies; 3+ messages in thread From: Li Zefan @ 2009-08-20 8:13 UTC (permalink / raw) To: Ingo Molnar Cc: Frederic Weisbecker, Steven Rostedt, Jason Baron, Masami Hiramatsu, LKML Before: # echo 1 > events/syscalls/sys_enter_sync/enable # cat events/syscalls/sys_enter_sync/format ... field:int nr; offset:12; size:4; print fmt: "# sync # cat trace ... sync-8950 [000] 2366.087670: sys_sync( After: # echo 1 > events/syscalls/sys_enter_sync/enable # cat events/syscalls/sys_enter_sync/format ... field:int nr; offset:12; size:4; print fmt: "" # sync # cat trace sync-2134 [001] 136.780735: sys_sync() Reported-by: Masami Hiramatsu <mhiramat@redhat.com> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- sorry for the repost, but I forgot to CC LKML. --- kernel/trace/trace_syscalls.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 28e4dae..46c1b97 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -46,15 +46,22 @@ print_syscall_enter(struct trace_iterator *iter, int flags) return TRACE_TYPE_PARTIAL_LINE; } /* parameter values */ - ret = trace_seq_printf(s, "%s: %lx%s ", entry->args[i], + ret = trace_seq_printf(s, "%s: %lx%s", entry->args[i], trace->args[i], - i == entry->nb_args - 1 ? ")" : ","); + i == entry->nb_args - 1 ? "" : ", "); if (!ret) return TRACE_TYPE_PARTIAL_LINE; } + ret = trace_seq_putc(s, ')'); + if (!ret) + return TRACE_TYPE_PARTIAL_LINE; + end: - trace_seq_printf(s, "\n"); + ret = trace_seq_putc(s, '\n'); + if (!ret) + return TRACE_TYPE_PARTIAL_LINE; + return TRACE_TYPE_HANDLED; } @@ -129,24 +136,24 @@ int syscall_enter_format(struct ftrace_event_call *call, struct trace_seq *s) offset += sizeof(unsigned long); } - trace_seq_printf(s, "\nprint fmt: \""); + trace_seq_puts(s, "\nprint fmt: \""); for (i = 0; i < entry->nb_args; i++) { ret = trace_seq_printf(s, "%s: 0x%%0%zulx%s", entry->args[i], sizeof(unsigned long), - i == entry->nb_args - 1 ? "\", " : ", "); + i == entry->nb_args - 1 ? "" : ", "); if (!ret) return 0; } + trace_seq_putc(s, '"'); for (i = 0; i < entry->nb_args; i++) { - ret = trace_seq_printf(s, "((unsigned long)(REC->%s))%s", - entry->args[i], - i == entry->nb_args - 1 ? "\n" : ", "); + ret = trace_seq_printf(s, ", ((unsigned long)(REC->%s))", + entry->args[i]); if (!ret) return 0; } - return ret; + return trace_seq_putc(s, '\n'); } int syscall_exit_format(struct ftrace_event_call *call, struct trace_seq *s) -- 1.6.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:tracing/core] tracing/syscalls: Fix the output of syscalls with no arguments 2009-08-20 8:13 ` [PATCH] tracing/syscalls: Fix the output of syscalls with no arguments Li Zefan @ 2009-08-20 10:54 ` tip-bot for Li Zefan 2009-08-20 11:34 ` [PATCH] " Frederic Weisbecker 1 sibling, 0 replies; 3+ messages in thread From: tip-bot for Li Zefan @ 2009-08-20 10:54 UTC (permalink / raw) To: linux-tip-commits Cc: linux-kernel, hpa, mingo, lizf, fweisbec, rostedt, tglx, jbaron, mhiramat, mingo Commit-ID: 4539f07701b3f743580d19dc5d655fb8d21b0a3c Gitweb: http://git.kernel.org/tip/4539f07701b3f743580d19dc5d655fb8d21b0a3c Author: Li Zefan <lizf@cn.fujitsu.com> AuthorDate: Thu, 20 Aug 2009 16:13:35 +0800 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Thu, 20 Aug 2009 12:12:22 +0200 tracing/syscalls: Fix the output of syscalls with no arguments Before: # echo 1 > events/syscalls/sys_enter_sync/enable # cat events/syscalls/sys_enter_sync/format ... field:int nr; offset:12; size:4; print fmt: "# sync # cat trace ... sync-8950 [000] 2366.087670: sys_sync( After: # echo 1 > events/syscalls/sys_enter_sync/enable # cat events/syscalls/sys_enter_sync/format ... field:int nr; offset:12; size:4; print fmt: "" # sync # cat trace sync-2134 [001] 136.780735: sys_sync() Reported-by: Masami Hiramatsu <mhiramat@redhat.com> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Jason Baron <jbaron@redhat.com> Cc: Masami Hiramatsu <mhiramat@redhat.com> LKML-Reference: <4A8D05AF.20103@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/trace/trace_syscalls.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 28e4dae..46c1b97 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -46,15 +46,22 @@ print_syscall_enter(struct trace_iterator *iter, int flags) return TRACE_TYPE_PARTIAL_LINE; } /* parameter values */ - ret = trace_seq_printf(s, "%s: %lx%s ", entry->args[i], + ret = trace_seq_printf(s, "%s: %lx%s", entry->args[i], trace->args[i], - i == entry->nb_args - 1 ? ")" : ","); + i == entry->nb_args - 1 ? "" : ", "); if (!ret) return TRACE_TYPE_PARTIAL_LINE; } + ret = trace_seq_putc(s, ')'); + if (!ret) + return TRACE_TYPE_PARTIAL_LINE; + end: - trace_seq_printf(s, "\n"); + ret = trace_seq_putc(s, '\n'); + if (!ret) + return TRACE_TYPE_PARTIAL_LINE; + return TRACE_TYPE_HANDLED; } @@ -129,24 +136,24 @@ int syscall_enter_format(struct ftrace_event_call *call, struct trace_seq *s) offset += sizeof(unsigned long); } - trace_seq_printf(s, "\nprint fmt: \""); + trace_seq_puts(s, "\nprint fmt: \""); for (i = 0; i < entry->nb_args; i++) { ret = trace_seq_printf(s, "%s: 0x%%0%zulx%s", entry->args[i], sizeof(unsigned long), - i == entry->nb_args - 1 ? "\", " : ", "); + i == entry->nb_args - 1 ? "" : ", "); if (!ret) return 0; } + trace_seq_putc(s, '"'); for (i = 0; i < entry->nb_args; i++) { - ret = trace_seq_printf(s, "((unsigned long)(REC->%s))%s", - entry->args[i], - i == entry->nb_args - 1 ? "\n" : ", "); + ret = trace_seq_printf(s, ", ((unsigned long)(REC->%s))", + entry->args[i]); if (!ret) return 0; } - return ret; + return trace_seq_putc(s, '\n'); } int syscall_exit_format(struct ftrace_event_call *call, struct trace_seq *s) ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tracing/syscalls: Fix the output of syscalls with no arguments 2009-08-20 8:13 ` [PATCH] tracing/syscalls: Fix the output of syscalls with no arguments Li Zefan 2009-08-20 10:54 ` [tip:tracing/core] " tip-bot for Li Zefan @ 2009-08-20 11:34 ` Frederic Weisbecker 1 sibling, 0 replies; 3+ messages in thread From: Frederic Weisbecker @ 2009-08-20 11:34 UTC (permalink / raw) To: Li Zefan; +Cc: Ingo Molnar, Steven Rostedt, Jason Baron, Masami Hiramatsu, LKML On Thu, Aug 20, 2009 at 04:13:35PM +0800, Li Zefan wrote: > Before: > > # echo 1 > events/syscalls/sys_enter_sync/enable > # cat events/syscalls/sys_enter_sync/format > ... > field:int nr; offset:12; size:4; > > print fmt: "# sync > # cat trace > ... > sync-8950 [000] 2366.087670: sys_sync( > > After: > > # echo 1 > events/syscalls/sys_enter_sync/enable > # cat events/syscalls/sys_enter_sync/format > ... > field:int nr; offset:12; size:4; > > print fmt: "" > # sync > # cat trace > sync-2134 [001] 136.780735: sys_sync() > > Reported-by: Masami Hiramatsu <mhiramat@redhat.com> > Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> > --- Thanks for fixing this! ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-08-20 11:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <4A8CAE0C.9040107@cn.fujitsu.com>
2009-08-20 8:13 ` [PATCH] tracing/syscalls: Fix the output of syscalls with no arguments Li Zefan
2009-08-20 10:54 ` [tip:tracing/core] " tip-bot for Li Zefan
2009-08-20 11:34 ` [PATCH] " Frederic Weisbecker
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).