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

Commit e3087b80 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Fix --stdio rendering 



The checks for not using a max_lines parameter were b0rked, problem
introduced in 36532461.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 124bb83c

tools/perf/util/annotate.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int objdump_line__print(struct objdump_line *oline, 
		if (percent < min_pcnt)

			return -1;



		if (printed >= max_lines)

		if (max_lines && printed >= max_lines)

			return 1;



		color = get_percent_color(percent);
@@ -154,7 +154,7 @@ static int objdump_line__print(struct objdump_line *oline, 
		color_fprintf(stdout, color, " %7.2f", percent);

		printf(" :	");

		color_fprintf(stdout, PERF_COLOR_BLUE, "%s\n", oline->line);

	} else if (printed >= max_lines)

	} else if (max_lines && printed >= max_lines)

		return 1;

	else {

		if (!*oline->line)