From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965319AbcLTTXw (ORCPT ); Tue, 20 Dec 2016 14:23:52 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35470 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965120AbcLTTXs (ORCPT ); Tue, 20 Dec 2016 14:23:48 -0500 Date: Tue, 20 Dec 2016 11:23:36 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, a.p.zijlstra@chello.nl, namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, mingo@kernel.org Reply-To: a.p.zijlstra@chello.nl, namhyung@kernel.org, dsahern@gmail.com, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org In-Reply-To: <1481538943-21874-3-git-send-email-jolsa@kernel.org> References: <1481538943-21874-3-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf evsel: Use variable instead of repeating lengthy FD macro Git-Commit-ID: 83c2e4f3968d6871eed295f2f5675d3d70b01afa X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 83c2e4f3968d6871eed295f2f5675d3d70b01afa Gitweb: http://git.kernel.org/tip/83c2e4f3968d6871eed295f2f5675d3d70b01afa Author: Jiri Olsa AuthorDate: Mon, 12 Dec 2016 11:35:40 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 15 Dec 2016 16:25:45 -0300 perf evsel: Use variable instead of repeating lengthy FD macro It's more readable and will ease up following patches. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1481538943-21874-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index b2365a63..fd61ebd 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1474,7 +1474,7 @@ retry_sample_id: for (cpu = 0; cpu < cpus->nr; cpu++) { for (thread = 0; thread < nthreads; thread++) { - int group_fd; + int fd, group_fd; if (!evsel->cgrp && !evsel->system_wide) pid = thread_map__pid(threads, thread); @@ -1484,21 +1484,22 @@ retry_open: pr_debug2("sys_perf_event_open: pid %d cpu %d group_fd %d flags %#lx", pid, cpus->map[cpu], group_fd, flags); - FD(evsel, cpu, thread) = sys_perf_event_open(&evsel->attr, - pid, - cpus->map[cpu], - group_fd, flags); - if (FD(evsel, cpu, thread) < 0) { + fd = sys_perf_event_open(&evsel->attr, pid, cpus->map[cpu], + group_fd, flags); + + FD(evsel, cpu, thread) = fd; + + if (fd < 0) { err = -errno; pr_debug2("\nsys_perf_event_open failed, error %d\n", err); goto try_fallback; } - pr_debug2(" = %d\n", FD(evsel, cpu, thread)); + pr_debug2(" = %d\n", fd); if (evsel->bpf_fd >= 0) { - int evt_fd = FD(evsel, cpu, thread); + int evt_fd = fd; int bpf_fd = evsel->bpf_fd; err = ioctl(evt_fd,