From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753216AbbIGOb3 (ORCPT ); Mon, 7 Sep 2015 10:31:29 -0400 Received: from mga02.intel.com ([134.134.136.20]:2388 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753054AbbIGObX (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="799482110" 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 09/14] perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps() Date: Mon, 7 Sep 2015 17:27:51 +0300 Message-Id: <1441636076-31390-10-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 Since there is a function to set maps, perf_evlist__create_maps() should use it. Signed-off-by: Adrian Hunter --- tools/perf/util/evlist.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 606fc6e63ec0..093ea73d863c 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1126,29 +1126,28 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist) int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) { - evlist->threads = thread_map__new_str(target->pid, target->tid, - target->uid); + struct cpu_map *cpus; + struct thread_map *threads; - if (evlist->threads == NULL) + threads = thread_map__new_str(target->pid, target->tid, target->uid); + + if (!threads) return -1; if (target__uses_dummy_map(target)) - evlist->cpus = cpu_map__dummy_new(); + cpus = cpu_map__dummy_new(); else - evlist->cpus = cpu_map__new(target->cpu_list); + cpus = cpu_map__new(target->cpu_list); - if (evlist->cpus == NULL) + if (!cpus) goto out_delete_threads; evlist->has_user_cpus = !!target->cpu_list; - perf_evlist__propagate_maps(evlist); - - return 0; + return perf_evlist__set_maps(evlist, cpus, threads); out_delete_threads: - thread_map__put(evlist->threads); - evlist->threads = NULL; + thread_map__put(threads); return -1; } -- 1.9.1