From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753199AbdKIOzf (ORCPT ); Thu, 9 Nov 2017 09:55:35 -0500 Received: from mga05.intel.com ([192.55.52.43]:32083 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752838AbdKIOzd (ORCPT ); Thu, 9 Nov 2017 09:55:33 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,370,1505804400"; d="scan'208";a="3018435" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH v1 4/5] perf, tools: Add fallback in perf_evsel__nr_cpus for no map Date: Thu, 9 Nov 2017 06:55:27 -0800 Message-Id: <20171109145528.23371-5-andi@firstfloor.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171109145528.23371-1-andi@firstfloor.org> References: <20171109145528.23371-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 db658785d828..25f21cde8826 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -157,7 +157,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