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

Commit 0ca0c130 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Replace sort's standalone field_sep with symbol_conf.field_sep 



The repsep_snprintf function was still using standalone field_sep, which
not even set anymore.

Replacing it with 'symbol_conf.field_sep'.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1346946426-13496-3-git-send-email-jolsa@redhat.com


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

tools/perf/util/sort.c

+2 −4
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ int sort__branch_mode = -1; /* -1 = means not set */ 


enum sort_type	sort__first_dimension;



char * field_sep;



LIST_HEAD(hist_entry__sort_list);



static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
@@ -23,11 +21,11 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...) 


	va_start(ap, fmt);

	n = vsnprintf(bf, size, fmt, ap);

	if (field_sep && n > 0) {

	if (symbol_conf.field_sep && n > 0) {

		char *sep = bf;



		while (1) {

			sep = strchr(sep, *field_sep);

			sep = strchr(sep, *symbol_conf.field_sep);

			if (sep == NULL)

				break;

			*sep = '.';

tools/perf/util/sort.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ extern const char default_sort_order[]; 
extern int sort__need_collapse;

extern int sort__has_parent;

extern int sort__branch_mode;

extern char *field_sep;

extern struct sort_entry sort_comm;

extern struct sort_entry sort_dso;

extern struct sort_entry sort_sym;