From patchwork Mon Feb 22 09:11:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 62505 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1114587lbl; Mon, 22 Feb 2016 01:21:28 -0800 (PST) X-Received: by 10.67.5.68 with SMTP id ck4mr5598673pad.3.1456132888240; Mon, 22 Feb 2016 01:21:28 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p3si3479594pfi.200.2016.02.22.01.21.27; Mon, 22 Feb 2016 01:21:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754195AbcBVJVY (ORCPT + 30 others); Mon, 22 Feb 2016 04:21:24 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:55272 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbcBVJVT (ORCPT ); Mon, 22 Feb 2016 04:21:19 -0500 Received: from 172.24.1.48 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.48]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BWL59831; Mon, 22 Feb 2016 17:12:09 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Mon, 22 Feb 2016 17:11:59 +0800 From: Wang Nan To: Alexei Starovoitov , Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo , Brendan Gregg CC: Adrian Hunter , Cody P Schafer , "David S. Miller" , He Kuang , =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= , Jiri Olsa , Kirill Smelkov , Li Zefan , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra , , Wang Nan , Subject: [PATCH 34/48] perf tools: Automatically add new channel according to evlist Date: Mon, 22 Feb 2016 09:11:01 +0000 Message-ID: <1456132275-98875-35-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1456132275-98875-1-git-send-email-wangnan0@huawei.com> References: <1456132275-98875-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.56CAD0EA.00F1, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 386be4140288ed55d6b8166feb0eda73 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org perf_evlist__channel_find() can be used to find a proper channel based on propreties of a evsel. If the channel doesn't exist, it can create new one for it. After this patch there's no need to create default channel explicitly. Signed-off-by: Wang Nan Signed-off-by: He Kuang Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/builtin-record.c | 5 ----- tools/perf/util/evlist.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 10 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 24c776c..cf8f67a 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -357,11 +357,6 @@ try_again: } perf_evlist__channel_reset(evlist); - rc = perf_evlist__channel_add(evlist, 0, true); - if (rc < 0) - goto out; - rc = 0; - if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false, opts->auxtrace_mmap_pages, opts->auxtrace_snapshot_mode) < 0) { diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index a6b52fc..d94f2c6 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -943,6 +943,43 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist, int idx, return 0; } +static unsigned long +perf_evlist__channel_for_evsel(struct perf_evsel *evsel __maybe_unused) +{ + return 0; +} + +static int +perf_evlist__channel_find(struct perf_evlist *evlist, + struct perf_evsel *evsel, + bool add_new) +{ + unsigned long flag = perf_evlist__channel_for_evsel(evsel); + int i; + + flag |= PERF_EVLIST__CHANNEL_ENABLED; + for (i = 0; i < perf_evlist__channel_nr(evlist); i++) + if (evlist->channel_flags[i] == flag) + return i; + if (add_new) + return perf_evlist__channel_add(evlist, flag, false); + return -ENOENT; +} + +static int +perf_evlist__channel_complete(struct perf_evlist *evlist) +{ + struct perf_evsel *evsel; + int err; + + evlist__for_each(evlist, evsel) { + err = perf_evlist__channel_find(evlist, evsel, true); + if (err < 0) + return err; + } + return 0; +} + static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx, struct mmap_params *mp, int cpu, int thread, int *output) @@ -1162,6 +1199,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, bool overwrite, unsigned int auxtrace_pages, bool auxtrace_overwrite) { + int err; struct perf_evsel *evsel; const struct cpu_map *cpus = evlist->cpus; const struct thread_map *threads = evlist->threads; @@ -1169,6 +1207,10 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, .prot = PROT_READ | (overwrite ? 0 : PROT_WRITE), }; + err = perf_evlist__channel_complete(evlist); + if (err) + return err; + if (evlist->mmap == NULL && perf_evlist__alloc_mmap(evlist) < 0) return -ENOMEM; @@ -1199,12 +1241,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, bool overwrite) { - int err; - perf_evlist__channel_reset(evlist); - err = perf_evlist__channel_add(evlist, 0, true); - if (err < 0) - return err; return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false); }