From: tip-bot for walimis <walimisdev@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, walimisdev@gmail.com,
hpa@zytor.com, mingo@redhat.com, rostedt@goodmis.org,
tglx@linutronix.de
Subject: [tip:tracing/core] tracing/events: fix output format of user stack
Date: Sun, 7 Jun 2009 10:22:10 GMT [thread overview]
Message-ID: <tip-048dc50c5e7eada19ebabbad70b7966d14283d41@git.kernel.org> (raw)
In-Reply-To: <1244016090-7814-3-git-send-email-walimisdev@gmail.com>
Commit-ID: 048dc50c5e7eada19ebabbad70b7966d14283d41
Gitweb: http://git.kernel.org/tip/048dc50c5e7eada19ebabbad70b7966d14283d41
Author: walimis <walimisdev@gmail.com>
AuthorDate: Wed, 3 Jun 2009 16:01:30 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Wed, 3 Jun 2009 10:25:30 -0400
tracing/events: fix output format of user stack
According to "events/ftrace/user_stack/format", fix the output of
user stack.
before fix:
sh-1073 [000] 31.137561: <b7f274fe> <- <0804e33c> <- <080835c1>
after fix:
sh-1072 [000] 37.039329:
=> <b7f8a4fe>
=> <0804e33c>
=> <080835c1>
Signed-off-by: walimis <walimisdev@gmail.com>
LKML-Reference: <1244016090-7814-3-git-send-email-walimisdev@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_output.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 64596a5..8dadbbb 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -389,17 +389,20 @@ seq_print_userip_objs(const struct userstack_entry *entry, struct trace_seq *s,
if (ip == ULONG_MAX || !ret)
break;
- if (i && ret)
- ret = trace_seq_puts(s, " <- ");
+ if (ret)
+ ret = trace_seq_puts(s, " => ");
if (!ip) {
if (ret)
ret = trace_seq_puts(s, "??");
+ if (ret)
+ ret = trace_seq_puts(s, "\n");
continue;
}
if (!ret)
break;
if (ret)
ret = seq_print_user_ip(s, mm, ip, sym_flags);
+ ret = trace_seq_puts(s, "\n");
}
if (mm)
@@ -1012,10 +1015,10 @@ static enum print_line_t trace_user_stack_print(struct trace_iterator *iter,
trace_assign_type(field, iter->ent);
- if (!seq_print_userip_objs(field, s, flags))
+ if (!trace_seq_putc(s, '\n'))
goto partial;
- if (!trace_seq_putc(s, '\n'))
+ if (!seq_print_userip_objs(field, s, flags))
goto partial;
return TRACE_TYPE_HANDLED;
next prev parent reply other threads:[~2009-06-07 10:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 8:01 [PATCH 1/3] tracing/trace_stack: fix the number of entries in the header walimis
2009-06-03 8:01 ` [PATCH 2/3] tracing/events: fix output format of kernel stack walimis
2009-06-03 8:01 ` [PATCH 3/3] tracing/events: fix output format of user stack walimis
2009-06-03 14:23 ` Steven Rostedt
2009-06-07 10:22 ` tip-bot for walimis [this message]
2009-06-03 14:23 ` [PATCH 2/3] tracing/events: fix output format of kernel stack Steven Rostedt
2009-06-07 10:21 ` [tip:tracing/core] " tip-bot for walimis
2009-06-03 13:59 ` [PATCH 1/3] tracing/trace_stack: fix the number of entries in the header Steven Rostedt
2009-06-07 10:21 ` [tip:tracing/core] " tip-bot for walimis
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-048dc50c5e7eada19ebabbad70b7966d14283d41@git.kernel.org \
--to=walimisdev@gmail.com \
--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