From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935670AbdKPTVr (ORCPT ); Thu, 16 Nov 2017 14:21:47 -0500 Received: from mga11.intel.com ([192.55.52.93]:27348 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933881AbdKPTVQ (ORCPT ); Thu, 16 Nov 2017 14:21:16 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,405,1505804400"; d="scan'208";a="3501214" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH v2 1/2] perf, tools: Add fallback in perf_evsel__nr_cpus for no map Date: Thu, 16 Nov 2017 11:21:09 -0800 Message-Id: <20171116192110.26817-2-andi@firstfloor.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171116192110.26817-1-andi@firstfloor.org> References: <20171116192110.26817-1-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Support the case of the event having no cpumap in perf_evsel__nr_cpus. Just return 1 in this case. This can happen in perf script when it uses the perf stat shadow functions. Signed-off-by: Andi Kleen --- tools/perf/util/evsel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 0688880227e1..bfa25a1c72fe 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -161,7 +161,8 @@ static inline struct cpu_map *perf_evsel__cpus(struct perf_evsel *evsel) static inline int perf_evsel__nr_cpus(struct perf_evsel *evsel) { - return perf_evsel__cpus(evsel)->nr; + struct cpu_map *map = perf_evsel__cpus(evsel); + return map ? map->nr : 1; } void perf_counts_values__scale(struct perf_counts_values *count, -- 2.13.6