perf env: Read msr pmu type from header
tip-bot for Kan Liang
merge botCommit-ID: e0838e029f4f6f271d6172b18f5473558ebdea1b Gitweb: http://git.kernel.org/tip/e0838e029f4f6f271d6172b18f5473558ebdea1b Author: Kan Liang <[email protected]> AuthorDate: Thu, 10 Sep 2015 11:03:05 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Sep 2015 12:50:24 -0300
perf env: Read msr pmu type from header
Get msr pmu type when processing pmu_mappings
Signed-off-by Kan Liang <[email protected]>
Acked-by Jiri Olsa <[email protected]>
[ Fixed it up wrt moving perf_env from header.h ]
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/env.h | 1 + tools/perf/util/header.c | 3 +++ 2 files changed, 4 insertions(+)
tools/perf/util/env.h +1 -0
@@ -16,6 +16,7 @@ struct perf_env {char *cpu_desc;char *cpuid;unsigned long long total_mem; +unsigned int msr_pmu_type;int nr_cmdline;int nr_sibling_cores;
tools/perf/util/header.c +3 -0
@@ -1787,6 +1787,9 @@ static int process_pmu_mappings(struct perf_file_section *section __maybe_unused/* include a NULL character at the end */ strbuf_add (&sb,"" ,1 ); +if (!strcmp (name,"msr" )) + ph->env.msr_pmu_type = type; +free (name); pmu_num--; }