Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 048dc50c authored by walimis's avatar walimis Committed by Steven Rostedt
Browse files

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: default avatarwalimis <walimisdev@gmail.com>
LKML-Reference: <1244016090-7814-3-git-send-email-walimisdev@gmail.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent f11b3f4e

kernel/trace/trace_output.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -389,17 +389,20 @@ seq_print_userip_objs(const struct userstack_entry *entry, struct trace_seq *s, 




		if (ip == ULONG_MAX || !ret)

		if (ip == ULONG_MAX || !ret)

			break;

			break;

		if (i && ret)

		if (ret)

			ret = trace_seq_puts(s, " <- ");

			ret = trace_seq_puts(s, " => ");

		if (!ip) {

		if (!ip) {

			if (ret)

			if (ret)

				ret = trace_seq_puts(s, "??");

				ret = trace_seq_puts(s, "??");

			if (ret)

				ret = trace_seq_puts(s, "\n");

			continue;

			continue;

		}

		}

		if (!ret)

		if (!ret)

			break;

			break;

		if (ret)

		if (ret)

			ret = seq_print_user_ip(s, mm, ip, sym_flags);

			ret = seq_print_user_ip(s, mm, ip, sym_flags);

		ret = trace_seq_puts(s, "\n");

	}

	}





	if (mm)

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

	trace_assign_type(field, iter->ent);





	if (!seq_print_userip_objs(field, s, flags))

	if (!trace_seq_putc(s, '\n'))

		goto partial;

		goto partial;





	if (!trace_seq_putc(s, '\n'))

	if (!seq_print_userip_objs(field, s, flags))

		goto partial;

		goto partial;





	return TRACE_TYPE_HANDLED;

	return TRACE_TYPE_HANDLED;