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

perf sort: Consolidate sort_entry__setup_elide() 



The same code was duplicate to places, factor them out to common
sort__setup_elide().

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1364991979-3008-11-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-diff.c

+1 −3
Original line number Diff line number Diff line
@@ -611,9 +611,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) 


	setup_pager();



	sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", NULL);

	sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", NULL);

	sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", NULL);

	sort__setup_elide(NULL);



	return __cmd_diff();

}

tools/perf/builtin-report.c

+1 −19
Original line number Diff line number Diff line
@@ -937,25 +937,7 @@ repeat: 
		report.symbol_filter_str = argv[0];

	}



	sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);



	if (sort__mode == SORT_MODE__BRANCH) {

		sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout);

		sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout);

		sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout);

		sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout);

	} else {

		if (report.mem_mode) {

			sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "symbol_daddr", stdout);

			sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso_daddr", stdout);

			sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "mem", stdout);

			sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "local_weight", stdout);

			sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "tlb", stdout);

			sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "snoop", stdout);

		}

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);

		sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);

	}

	sort__setup_elide(stdout);



	ret = __cmd_report(&report);

	if (ret == K_SWITCH_INPUT_DATA) {

tools/perf/builtin-top.c

+1 −3
Original line number Diff line number Diff line
@@ -1200,9 +1200,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (symbol__init() < 0)

		return -1;



	sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);

	sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);

	sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);

	sort__setup_elide(stdout);



	/*

	 * Avoid annotation data structures overhead when symbols aren't on the

tools/perf/util/sort.c

+43 −2
Original line number Diff line number Diff line 
#include "sort.h"

#include "hist.h"

#include "symbol.h"



regex_t		parent_regex;

const char	default_parent_pattern[] = "^sys_|^do_page_fault";
@@ -1009,7 +1010,8 @@ int setup_sorting(void) 
	return ret;

}



void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,

static void sort_entry__setup_elide(struct sort_entry *self,

				    struct strlist *list,

				    const char *list_name, FILE *fp)

{

	if (list && strlist__nr_entries(list) == 1) {
@@ -1019,3 +1021,42 @@ void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list, 
		self->elide = true;

	}

}



void sort__setup_elide(FILE *output)

{

	sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

				"dso", output);

	sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list,

				"comm", output);

	sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list,

				"symbol", output);



	if (sort__mode == SORT_MODE__BRANCH) {

		sort_entry__setup_elide(&sort_dso_from,

					symbol_conf.dso_from_list,

					"dso_from", output);

		sort_entry__setup_elide(&sort_dso_to,

					symbol_conf.dso_to_list,

					"dso_to", output);

		sort_entry__setup_elide(&sort_sym_from,

					symbol_conf.sym_from_list,

					"sym_from", output);

		sort_entry__setup_elide(&sort_sym_to,

					symbol_conf.sym_to_list,

					"sym_to", output);

	} else if (sort__mode == SORT_MODE__MEMORY) {

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

					"symbol_daddr", output);

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

					"dso_daddr", output);

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

					"mem", output);

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

					"local_weight", output);

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

					"tlb", output);

		sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,

					"snoop", output);

	}



}

tools/perf/util/sort.h

+1 −2
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ extern struct list_head hist_entry__sort_list; 


int setup_sorting(void);

extern int sort_dimension__add(const char *);

void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,

			     const char *list_name, FILE *fp);

void sort__setup_elide(FILE *fp);



#endif	/* __PERF_SORT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE