Commit c5885749 authored Aug 14, 2013 by Stephane Eranian Committed by Arnaldo Carvalho de Melo Aug 14, 2013

perf tools: Improve robustness of topology parsing code



This patch improves the robustness of the build_cpu_topo() routine by
allowing either the CPU parsing or the thread parsing to fail and yet
get perf to produce some topology data which could be useful for the
analysis.

Without this patch, if the cpu parsing fails, the thread parsing is not
attempted vice-versa.

Signed-off-by: Stephane Eranian <eranian@google.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20130814100426.GA3444@quad


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 309b5185

tools/perf/util/header.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -716,18 +716,19 @@ static int build_cpu_topo(struct cpu_topo *tp, int cpu)
		char filename[MAXPATHLEN];
		char buf = NULL, p;
		size_t len = 0;
		ssize_t sret;
		u32 i = 0;
		int ret = -1;

		sprintf(filename, CORE_SIB_FMT, cpu);
		fp = fopen(filename, "r");
		if (!fp)
		return -1;

		if (getline(&buf, &len, fp) <= 0)
		goto done;
		goto try_threads;

		sret = getline(&buf, &len, fp);
		fclose(fp);
		if (sret <= 0)
		goto try_threads;

		p = strchr(buf, '\n');
		if (p)
		@@ -743,7 +744,9 @@ static int build_cpu_topo(struct cpu_topo *tp, int cpu)
		buf = NULL;
		len = 0;
		}
		ret = 0;

		try_threads:
		sprintf(filename, THRD_SIB_FMT, cpu);
		fp = fopen(filename, "r");
		if (!fp)

Admin message