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>
mariux64 · Sep 14, 2015 · e0838e0 · e0838e0
1 parent b601140
commit e0838e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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--;
 	}