Commit c8829c7a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf util: Remove setup_sorting dups 



And it is also needed by 'perf diff'.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260828571-3613-1-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f823e441

tools/perf/builtin-annotate.c

+1 −16
Original line number Diff line number Diff line
@@ -521,21 +521,6 @@ static const struct option options[] = { 
	OPT_END()

};



static void setup_sorting(void)

{

	char *tmp, *tok, *str = strdup(sort_order);



	for (tok = strtok_r(str, ", ", &tmp);

			tok; tok = strtok_r(NULL, ", ", &tmp)) {

		if (sort_dimension__add(tok) < 0) {

			error("Unknown --sort key: `%s'", tok);

			usage_with_options(annotate_usage, options);

		}

	}



	free(str);

}



int cmd_annotate(int argc, const char **argv, const char *prefix __used)

{

	if (symbol__init(&symbol_conf) < 0)
@@ -543,7 +528,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) 


	argc = parse_options(argc, argv, options, annotate_usage, 0);



	setup_sorting();

	setup_sorting(annotate_usage, options);



	if (argc) {

		/*

tools/perf/builtin-report.c

+1 −16
Original line number Diff line number Diff line
@@ -843,21 +843,6 @@ static const struct option options[] = { 
	OPT_END()

};



static void setup_sorting(void)

{

	char *tmp, *tok, *str = strdup(sort_order);



	for (tok = strtok_r(str, ", ", &tmp);

			tok; tok = strtok_r(NULL, ", ", &tmp)) {

		if (sort_dimension__add(tok) < 0) {

			error("Unknown --sort key: `%s'", tok);

			usage_with_options(report_usage, options);

		}

	}



	free(str);

}



static void setup_list(struct strlist **list, const char *list_str,

		       struct sort_entry *se, const char *list_name,

		       FILE *fp)
@@ -884,7 +869,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) 


	argc = parse_options(argc, argv, options, report_usage, 0);



	setup_sorting();

	setup_sorting(report_usage, options);



	if (parent_pattern != default_parent_pattern) {

		sort_dimension__add("parent");

tools/perf/util/sort.c

+15 −0
Original line number Diff line number Diff line
@@ -288,3 +288,18 @@ int sort_dimension__add(const char *tok) 


	return -ESRCH;

}



void setup_sorting(const char * const usagestr[], const struct option *opts)

{

	char *tmp, *tok, *str = strdup(sort_order);



	for (tok = strtok_r(str, ", ", &tmp);

			tok; tok = strtok_r(NULL, ", ", &tmp)) {

		if (sort_dimension__add(tok) < 0) {

			error("Unknown --sort key: `%s'", tok);

			usage_with_options(usagestr, opts);

		}

	}



	free(str);

}

tools/perf/util/sort.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ struct sort_entry { 
extern struct sort_entry sort_thread;

extern struct list_head hist_entry__sort_list;



void setup_sorting(const char * const usagestr[], const struct option *opts);



extern int repsep_fprintf(FILE *fp, const char *fmt, ...);

extern size_t sort__thread_print(FILE *, struct hist_entry *, unsigned int);

extern size_t sort__comm_print(FILE *, struct hist_entry *, unsigned int);

CRA Git | Maintained and supported by SUSTech CRA and CCSE