Commit e425da6c authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Remove disasm__calc_percent() from annotate_browser__calc_percent()



Remove disasm__calc_percent() from annotate_browser__calc_percent(),
because we already have the data calculated in struct annotation_line.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171011150158.11895-21-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f681d593
Loading
Loading
Loading
Loading
+6 −13
Original line number Diff line number Diff line
@@ -444,17 +444,16 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
	struct map_symbol *ms = browser->b.priv;
	struct symbol *sym = ms->sym;
	struct annotation *notes = symbol__annotation(sym);
	struct annotation_line *next;
	struct disasm_line *pos;
	s64 len = symbol__size(sym);

	browser->entries = RB_ROOT;

	pthread_mutex_lock(&notes->lock);

	symbol__calc_percent(sym, evsel);

	list_for_each_entry(pos, &notes->src->source, al.node) {
		struct browser_disasm_line *bpos = disasm_line__browser(pos);
		const char *path = NULL;
		double max_percent = 0.0;
		int i;

@@ -463,17 +462,11 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
			continue;
		}

		next = annotation_line__next(&pos->al, &notes->src->source);

		for (i = 0; i < browser->nr_events; i++) {
			struct sym_hist_entry sample;

			bpos->samples[i].percent = disasm__calc_percent(notes,
						evsel->idx + i,
						pos->al.offset,
						next ? next->offset : len,
						&path, &sample);
			bpos->samples[i].he = sample;
			struct annotation_data *sample = &pos->al.samples[i];

			bpos->samples[i].percent = sample->percent;
			bpos->samples[i].he      = sample->he;

			if (max_percent < bpos->samples[i].percent)
				max_percent = bpos->samples[i].percent;