public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
	Andrew Morton <akpm@linux-foundation.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	walimis <walimisdev@gmail.com>
Subject: [PATCH 3/5] tracing/events: fix output format of user stack
Date: Wed, 03 Jun 2009 11:17:27 -0400	[thread overview]
Message-ID: <20090603151821.119336461@goodmis.org> (raw)
In-Reply-To: 20090603151724.144915858@goodmis.org

[-- Attachment #1: 0003-tracing-events-fix-output-format-of-user-stack.patch --]
[-- Type: text/plain, Size: 1642 bytes --]

From: walimis <walimisdev@gmail.com>

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;
-- 
1.6.3.1

-- 

  parent reply	other threads:[~2009-06-03 15:19 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-03 15:17 [PATCH 0/5] [GIP PULL] tracing/events/trace_stack: various fixes Steven Rostedt
2009-06-03 15:17 ` [PATCH 1/5] tracing/trace_stack: fix the number of entries in the header Steven Rostedt
2009-06-03 15:17 ` [PATCH 2/5] tracing/events: fix output format of kernel stack Steven Rostedt
2009-06-03 15:17 ` Steven Rostedt [this message]
2009-06-03 15:17 ` [PATCH 4/5] tracing: fix multiple use of __print_flags and __print_symbolic Steven Rostedt
2009-06-03 15:17 ` [PATCH 5/5] tracing: add annotation to what type of stack trace is recorded Steven Rostedt
2009-06-05 14:52 ` [PATCH 0/5] [GIP PULL] tracing/events/trace_stack: various fixes Ingo Molnar
2009-06-07  8:22   ` Ingo Molnar
2009-06-08 15:37     ` Steven Rostedt
2009-06-08 16:18       ` Peter Zijlstra
2009-06-08 16:22         ` Steven Rostedt
2009-06-08 23:00         ` [PATCH][GIT PULL] ring-buffer: pass in lockdep class key for reader_lock Steven Rostedt
2009-06-09 11:20           ` Ingo Molnar
2009-06-09 11:44             ` Steven Rostedt
2009-06-09 12:03               ` Ingo Molnar
2009-06-09 14:52         ` [tip:tracing/core] " tip-bot for Peter Zijlstra

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=20090603151821.119336461@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=walimisdev@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