Commit 0d203166 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Bail out at "--sort dcacheline" and cacheline_size not known 

There are cases where further work would be needed to overcome the fact
that neither sysconf(_SC_LEVEL1_DCACHE_LINESIZE) nor
/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size are
available in some systems (Android, for instance), so bail out when such
a situation takes place.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-ho8d8g8mh0o2dri7ckcccafi@git.kernel.org


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

tools/perf/util/sort.c

+7 −1
Original line number Diff line number Diff line
@@ -2381,6 +2381,9 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok, 
		if (sort__mode != SORT_MODE__MEMORY)

			return -EINVAL;



		if (sd->entry == &sort_mem_dcacheline && cacheline_size == 0)

			return -EINVAL;



		if (sd->entry == &sort_mem_daddr_sym)

			list->sym = 1;
@@ -2424,6 +2427,9 @@ static int setup_sort_list(struct perf_hpp_list *list, char *str, 
		if (*tok) {

			ret = sort_dimension__add(list, tok, evlist, level);

			if (ret == -EINVAL) {

				if (!cacheline_size && !strncasecmp(tok, "dcacheline", strlen(tok)))

					error("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");

				else

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

				break;

			} else if (ret == -ESRCH) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE