Commit af0a6fa4 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

perf tools: Fix missing top level callchain 



While recursively printing the branches of each callchains, we
forget to display the root. It is never printed.

Say we have:

    symbol
    f1
    f2
     |
     -------- f3
     |        f4
     |
     ---------f5
              f6

Actually we never see that, instead it displays:

    symbol
    |
    --------- f3
    |         f4
    |
    --------- f5
              f6

However f1 is always the same than "symbol" and if we are
sorting by symbols first then "symbol", f1 and f2 will be well
aligned like in the above example, so displaying f1 looks
redundant here.

But if we are sorting by something else first (dso, comm,
etc...), displaying f1 doesn't look redundant but rather
necessary because the symbol is not well aligned anymore with
its callchain:

     comm     dso        symbol
     f1
     f2
     |
     --------- [...]

And we want the callchain to be obvious.
So we fix the bug by printing the root branch, but we also
filter its first entry if we are sorting by symbols first.

Reported-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1256246604-17156-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4e3b799d

tools/perf/builtin-report.c

+33 −7
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void init_rem_hits(void) 
}



static size_t

callchain__fprintf_graph(FILE *fp, struct callchain_node *self,

__callchain__fprintf_graph(FILE *fp, struct callchain_node *self,

			   u64 total_samples, int depth, int depth_mask)

{

	struct rb_node *node, *next;
@@ -174,7 +174,7 @@ callchain__fprintf_graph(FILE *fp, struct callchain_node *self, 
						      new_total,

						      cumul);

		}

		ret += callchain__fprintf_graph(fp, child, new_total,

		ret += __callchain__fprintf_graph(fp, child, new_total,

						  depth + 1,

						  new_depth_mask | (1 << depth));

		node = next;
@@ -196,6 +196,33 @@ callchain__fprintf_graph(FILE *fp, struct callchain_node *self, 
	return ret;

}



static size_t

callchain__fprintf_graph(FILE *fp, struct callchain_node *self,

			 u64 total_samples)

{

	struct callchain_list *chain;

	int i = 0;

	int ret = 0;



	list_for_each_entry(chain, &self->val, list) {

		if (chain->ip >= PERF_CONTEXT_MAX)

			continue;



		if (!i++ && sort_by_sym_first)

			continue;



		if (chain->sym)

			ret += fprintf(fp, "                %s\n", chain->sym->name);

		else

			ret += fprintf(fp, "                %p\n",

					(void *)(long)chain->ip);

	}



	ret += __callchain__fprintf_graph(fp, self, total_samples, 1, 1);



	return ret;

}



static size_t

callchain__fprintf_flat(FILE *fp, struct callchain_node *self,

			u64 total_samples)
@@ -244,8 +271,7 @@ hist_entry_callchain__fprintf(FILE *fp, struct hist_entry *self, 
			break;

		case CHAIN_GRAPH_ABS: /* Falldown */

		case CHAIN_GRAPH_REL:

			ret += callchain__fprintf_graph(fp, chain,

							total_samples, 1, 1);

			ret += callchain__fprintf_graph(fp, chain, total_samples);

		case CHAIN_NONE:

		default:

			break;

tools/perf/util/sort.c

+7 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ char default_sort_order[] = "comm,dso,symbol"; 
char		*sort_order = default_sort_order;

int		sort__need_collapse = 0;

int		sort__has_parent = 0;

int		sort_by_sym_first;



unsigned int dsos__col_width;

unsigned int comms__col_width;
@@ -265,6 +266,10 @@ int sort_dimension__add(const char *tok) 
			sort__has_parent = 1;

		}



		if (list_empty(&hist_entry__sort_list) &&

		    !strcmp(sd->name, "symbol"))

			sort_by_sym_first = true;



		list_add_tail(&sd->entry->list, &hist_entry__sort_list);

		sd->taken = 1;
@@ -273,4 +278,3 @@ int sort_dimension__add(const char *tok) 


	return -ESRCH;

}

tools/perf/util/sort.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ extern struct sort_entry sort_parent; 
extern unsigned int dsos__col_width;

extern unsigned int comms__col_width;

extern unsigned int threads__col_width;

extern int sort_by_sym_first;



struct hist_entry {

	struct rb_node		rb_node;

CRA Git | Maintained and supported by SUSTech CRA and CCSE