From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933959AbbIDWB2 (ORCPT ); Fri, 4 Sep 2015 18:01:28 -0400 Received: from mga09.intel.com ([134.134.136.24]:26263 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933677AbbIDWB1 (ORCPT ); Fri, 4 Sep 2015 18:01:27 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,470,1437462000"; d="scan'208";a="798098741" From: kan.liang@intel.com To: acme@kernel.org Cc: jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, eranian@google.com, ak@linux.intel.com, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH 1/5] perf,tools: add processor socket info in hist_entry and addr_location Date: Fri, 4 Sep 2015 10:45:42 -0400 Message-Id: <1441377946-44429-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 From: Kan Liang Add processor socket id info in hist_entry and addr_location. For perf report, the socket id info is from perf.data. For others, the socket id info is from current system. Signed-off-by: Kan Liang --- tools/perf/builtin-report.c | 4 ++++ tools/perf/util/event.c | 1 + tools/perf/util/hist.c | 1 + tools/perf/util/sort.h | 1 + tools/perf/util/symbol.h | 1 + 5 files changed, 8 insertions(+) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 62b285e..affd70d 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -149,6 +149,7 @@ static int process_sample_event(struct perf_tool *tool, .add_entry_cb = hist_iter__report_callback, }; int ret = 0; + struct perf_env *env = evsel->evlist->env; if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) { pr_debug("problem processing %d event, skipping it.\n", @@ -156,6 +157,9 @@ static int process_sample_event(struct perf_tool *tool, return -1; } + /* read socket id from perf.data for perf report */ + al.socket = env->cpu[al.cpu].socket_id; + if (rep->hide_unresolved && al.sym == NULL) goto out_put; diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 7ff6127..0bf8c98 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -1021,6 +1021,7 @@ int perf_event__preprocess_sample(const union perf_event *event, al->sym = NULL; al->cpu = sample->cpu; + al->socket = cpu_map__get_socket_id(al->cpu); if (al->map) { struct dso *dso = al->map->dso; diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 08b6cd9..80c4683 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -452,6 +452,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists, .map = al->map, .sym = al->sym, }, + .socket = al->socket, .cpu = al->cpu, .cpumode = al->cpumode, .ip = al->addr, diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 3c2a399..7cf1cf7 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -90,6 +90,7 @@ struct hist_entry { struct comm *comm; u64 ip; u64 transaction; + s32 socket; s32 cpu; u8 cpumode; diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index 440ba8a..40073c6 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -191,6 +191,7 @@ struct addr_location { u8 filtered; u8 cpumode; s32 cpu; + s32 socket; }; struct symsrc { -- 1.8.3.1