Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753340AbbH0Slb (ORCPT ); Thu, 27 Aug 2015 14:41:31 -0400 Received: from mga02.intel.com ([134.134.136.20]:7109 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752351AbbH0Sl3 (ORCPT ); Thu, 27 Aug 2015 14:41:29 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,422,1437462000"; d="scan'208";a="549764371" From: kan.liang@intel.com To: acme@kernel.org, jolsa@kernel.org Cc: ak@linux.intel.com, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH 1/1] perf,tools: store cpu->socket and cpu->core in perf_session_env Date: Thu, 27 Aug 2015 07:25:35 -0400 Message-Id: <1440674735-13373-1-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3329 Lines: 118 From: Kan Liang This patch parse cpu_topology from perf.data, and store cpu's socket id and core id information in perf_session_env. Signed-off-by: Kan Liang --- tools/perf/util/header.c | 27 ++++++++++++++++++++++++++- tools/perf/util/header.h | 6 ++++++ tools/perf/util/session.c | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 179b2bd..9308340 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1590,10 +1590,17 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused u32 nr, i; char *str; struct strbuf sb; + int cpu_nr = ph->env.nr_cpus_online; + struct cpu_map *map; + int j; + + ph->env.cpu = calloc(cpu_nr, sizeof(*ph->env.cpu)); + if (!ph->env.cpu) + return -1; ret = readn(fd, &nr, sizeof(nr)); if (ret != sizeof(nr)) - return -1; + goto free_cpu; if (ph->needs_swap) nr = bswap_32(nr); @@ -1608,6 +1615,14 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused /* include a NULL character at the end */ strbuf_add(&sb, str, strlen(str) + 1); + + map = cpu_map__new(str); + if (!map) + goto error; + for (j = 0; j < map->nr; j++) { + ph->env.cpu[map->map[j]].socket_id = i; + } + cpu_map__put(map); free(str); } ph->env.sibling_cores = strbuf_detach(&sb, NULL); @@ -1628,6 +1643,14 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused /* include a NULL character at the end */ strbuf_add(&sb, str, strlen(str) + 1); + + map = cpu_map__new(str); + if (!map) + goto error; + for (j = 0; j < map->nr; j++) { + ph->env.cpu[map->map[j]].core_id = i; + } + cpu_map__put(map); free(str); } ph->env.sibling_threads = strbuf_detach(&sb, NULL); @@ -1635,6 +1658,8 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused error: strbuf_release(&sb); +free_cpu: + free(ph->env.cpu); return -1; } diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 9b53b65..8b8c4fc 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -66,6 +66,11 @@ struct perf_header; int perf_file_header__read(struct perf_file_header *header, struct perf_header *ph, int fd); +struct cpu_topology_map { + int socket_id; + int core_id; +}; + struct perf_session_env { char *hostname; char *os_release; @@ -89,6 +94,7 @@ struct perf_session_env { char *sibling_threads; char *numa_nodes; char *pmu_mappings; + struct cpu_topology_map *cpu; }; struct perf_header { diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 18722e7..51b4d5a 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -185,6 +185,7 @@ static void perf_session_env__exit(struct perf_session_env *env) zfree(&env->sibling_threads); zfree(&env->numa_nodes); zfree(&env->pmu_mappings); + zfree(&env->cpu); } void perf_session__delete(struct perf_session *session) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/