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

Commit e5ccf9f4 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Factor out disasm__calc_percent() 



Factor out calculation of histogram of a symbol into
disasm__calc_percent.  It'll be used for later changes.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1362462812-30885-4-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3aec150a

tools/perf/util/annotate.c

+30 −19
Original line number Original line Diff line number Diff line
@@ -603,32 +603,20 @@ struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disa 
	return NULL;

	return NULL;

}

}





static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 start,

static double disasm__calc_percent(struct disasm_line *next,

		      struct perf_evsel *evsel, u64 len, int min_pcnt, int printed,

				   struct annotation *notes, int evidx,

		      int max_lines, struct disasm_line *queue)

				   s64 offset, u64 len, const char **path)

{

{

	static const char *prev_line;

	struct source_line *src_line = notes->src->lines;

	static const char *prev_color;

	struct sym_hist *h = annotation__histogram(notes, evidx);



	if (dl->offset != -1) {

		const char *path = NULL;

	unsigned int hits = 0;

	unsigned int hits = 0;

	double percent = 0.0;

	double percent = 0.0;

		const char *color;

		struct annotation *notes = symbol__annotation(sym);

		struct source_line *src_line = notes->src->lines;

		struct sym_hist *h = annotation__histogram(notes, evsel->idx);

		s64 offset = dl->offset;

		const u64 addr = start + offset;

		struct disasm_line *next;



		next = disasm__get_next_ip_line(&notes->src->source, dl);





	while (offset < (s64)len &&

	while (offset < (s64)len &&

	       (next == NULL || offset < next->offset)) {

	       (next == NULL || offset < next->offset)) {

		if (src_line) {

		if (src_line) {

				if (path == NULL)

			if (*path == NULL)

					path = src_line[offset].path;

				*path = src_line[offset].path;

			percent += src_line[offset].percent;

			percent += src_line[offset].percent;

		} else

		} else

			hits += h->addr[offset];

			hits += h->addr[offset];
@@ -639,6 +627,29 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st 
	if (src_line == NULL && h->sum)

	if (src_line == NULL && h->sum)

		percent = 100.0 * hits / h->sum;

		percent = 100.0 * hits / h->sum;





	return percent;

}



static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 start,

		      struct perf_evsel *evsel, u64 len, int min_pcnt, int printed,

		      int max_lines, struct disasm_line *queue)

{

	static const char *prev_line;

	static const char *prev_color;



	if (dl->offset != -1) {

		const char *path = NULL;

		double percent;

		const char *color;

		struct annotation *notes = symbol__annotation(sym);

		s64 offset = dl->offset;

		const u64 addr = start + offset;

		struct disasm_line *next;



		next = disasm__get_next_ip_line(&notes->src->source, dl);



		percent = disasm__calc_percent(next, notes, evsel->idx,

					       offset, len, &path);

		if (percent < min_pcnt)

		if (percent < min_pcnt)

			return -1;

			return -1;