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

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

perf annotate: Factor out struct source_line_percent 



The source_line_percent struct contains percentage value of the symbol
histogram.  This is a preparation of event group view change.

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-8-git-send-email-namhyung@kernel.org


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

tools/perf/ui/browsers/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static double disasm_line__calc_percent(struct disasm_line *dl, struct symbol *s 
		while (offset < (s64)len &&

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

			if (src_line) {

				percent += src_line[offset].percent;

				percent += src_line[offset].p[0].percent;

			} else

				hits += h->addr[offset];

tools/perf/util/annotate.c

+7 −7
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static double disasm__calc_percent(struct annotation *notes, int evidx, 
			if (*path == NULL)

				*path = src_line[offset].path;



			percent += src_line[offset++].percent;

			percent += src_line[offset++].p[0].percent;

		}

	} else {

		while (offset < end)
@@ -929,7 +929,7 @@ static void insert_source_line(struct rb_root *root, struct source_line *src_lin 


		ret = strcmp(iter->path, src_line->path);

		if (ret == 0) {

			iter->percent_sum += src_line->percent;

			iter->p[0].percent_sum += src_line->p[0].percent;

			return;

		}
@@ -939,7 +939,7 @@ static void insert_source_line(struct rb_root *root, struct source_line *src_lin 
			p = &(*p)->rb_right;

	}



	src_line->percent_sum = src_line->percent;

	src_line->p[0].percent_sum = src_line->p[0].percent;



	rb_link_node(&src_line->node, parent, p);

	rb_insert_color(&src_line->node, root);
@@ -955,7 +955,7 @@ static void __resort_source_line(struct rb_root *root, struct source_line *src_l 
		parent = *p;

		iter = rb_entry(parent, struct source_line, node);



		if (src_line->percent_sum > iter->percent_sum)

		if (src_line->p[0].percent_sum > iter->p[0].percent_sum)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;
@@ -1025,8 +1025,8 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, 
		u64 offset;

		FILE *fp;



		src_line[i].percent = 100.0 * h->addr[i] / h->sum;

		if (src_line[i].percent <= 0.5)

		src_line[i].p[0].percent = 100.0 * h->addr[i] / h->sum;

		if (src_line[i].p[0].percent <= 0.5)

			continue;



		offset = start + i;
@@ -1073,7 +1073,7 @@ static void print_summary(struct rb_root *root, const char *filename) 
		char *path;



		src_line = rb_entry(node, struct source_line, node);

		percent = src_line->percent_sum;

		percent = src_line->p[0].percent_sum;

		color = get_percent_color(percent);

		path = src_line->path;

tools/perf/util/annotate.h

+6 −2
Original line number Diff line number Diff line
@@ -74,11 +74,15 @@ struct sym_hist { 
	u64		addr[0];

};



struct source_line {

	struct rb_node	node;

struct source_line_percent {

	double		percent;

	double		percent_sum;

};



struct source_line {

	struct rb_node	node;

	char		*path;

	struct source_line_percent p[1];

};



/** struct annotated_source - symbols with hits have this attached as in sannotation