From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753283AbbIGObe (ORCPT ); Mon, 7 Sep 2015 10:31:34 -0400 Received: from mga02.intel.com ([134.134.136.20]:34951 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753034AbbIGObX (ORCPT ); Mon, 7 Sep 2015 10:31:23 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,485,1437462000"; d="scan'208";a="799482092" From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , mingo@kernel.org, kan.liang@intel.com, linux-kernel@vger.kernel.org Subject: [PATCH V2 08/14] perf tools: Make perf_evlist__set_maps() more resilient Date: Mon, 7 Sep 2015 17:27:50 +0300 Message-Id: <1441636076-31390-9-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441636076-31390-1-git-send-email-adrian.hunter@intel.com> References: <1441636076-31390-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make perf_evlist__set_maps() more resilient by allowing for the possibility that one or another of the maps isn't being changed and therefore should not be "put". Signed-off-by: Adrian Hunter --- tools/perf/util/evlist.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 6764e0eff849..606fc6e63ec0 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1156,11 +1156,22 @@ int perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus, struct thread_map *threads) { - cpu_map__put(evlist->cpus); - evlist->cpus = cpus; + /* + * Allow for the possibility that one or another of the maps isn't being + * changed i.e. don't put it. Note we are assuming the maps that are + * being applied are brand new and evlist is taking ownership of the + * original reference count of 1. If that is not the case it is up to + * the caller to increase the reference count. + */ + if (cpus != evlist->cpus) { + cpu_map__put(evlist->cpus); + evlist->cpus = cpus; + } - thread_map__put(evlist->threads); - evlist->threads = threads; + if (threads != evlist->threads) { + thread_map__put(evlist->threads); + evlist->threads = threads; + } perf_evlist__propagate_maps(evlist); -- 1.9.1