diff options
| author | Kan Liang <kan.liang@intel.com> | 2015-09-10 17:03:05 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-09-14 18:50:24 +0300 |
| commit | e0838e029f4f6f271d6172b18f5473558ebdea1b (patch) | |
| tree | e78a5844bfd68695a08529a3d575616a3ea52345 | |
| parent | b60114067c656be572f0ca4030c3a2c560e7255c (diff) | |
| download | linux-e0838e029f4f6f271d6172b18f5473558ebdea1b.tar.xz | |
perf env: Read msr pmu type from header
Get msr pmu type when processing pmu_mappings
Signed-off-by: Kan Liang <kan.liang@intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/n/tip-3ngei63gepydwxhvytl2wx89@git.kernel.org
[ Fixed it up wrt moving perf_env from header.h ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/util/env.h | 1 | ||||
| -rw-r--r-- | tools/perf/util/header.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 70124d9a1624..d0d1a9681531 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -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; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 151b8310ac70..f307b17aa45e 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -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--; } |