From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754302AbcEXFtW (ORCPT ); Tue, 24 May 2016 01:49:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52014 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754270AbcEXFtU (ORCPT ); Tue, 24 May 2016 01:49:20 -0400 Date: Mon, 23 May 2016 22:48:02 -0700 From: tip-bot for Wang Nan Message-ID: Cc: wangnan0@huawei.com, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, hekuang@huawei.com, lizefan@huawei.com, mingo@kernel.org Reply-To: masami.hiramatsu.pt@hitachi.com, wangnan0@huawei.com, hpa@zytor.com, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, lizefan@huawei.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hekuang@huawei.com In-Reply-To: <1463987628-163563-2-git-send-email-wangnan0@huawei.com> References: <1463987628-163563-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf evlist: Add API to pause/resume Git-Commit-ID: 65aea2338765da1a58cc26eeb84d72308492ecb5 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: 65aea2338765da1a58cc26eeb84d72308492ecb5 Gitweb: http://git.kernel.org/tip/65aea2338765da1a58cc26eeb84d72308492ecb5 Author: Wang Nan AuthorDate: Mon, 23 May 2016 07:13:38 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 May 2016 18:22:00 -0300 perf evlist: Add API to pause/resume perf_evlist__toggle_{pause,resume}() are introduced to pause/resume events in an evlist. Utilize PERF_EVENT_IOC_PAUSE_OUTPUT ioctl. Following commits use them to ensure overwrite ring buffer is paused before reading. Signed-off-by: Wang Nan Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1463987628-163563-2-git-send-email-wangnan0@huawei.com Signed-off-by: He Kuang [ Return -1, like all other ioctl() usage in evlist.c, rename 'pause' arg to avoid breaking the build on ubuntu 12.04 and other old systems ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 27 +++++++++++++++++++++++++++ tools/perf/util/evlist.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 1a370db..904523a 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -679,6 +679,33 @@ static struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist, return NULL; } +static int perf_evlist__set_paused(struct perf_evlist *evlist, bool value) +{ + int i; + + for (i = 0; i < evlist->nr_mmaps; i++) { + int fd = evlist->mmap[i].fd; + int err; + + if (fd < 0) + continue; + err = ioctl(fd, PERF_EVENT_IOC_PAUSE_OUTPUT, value ? 1 : 0); + if (err) + return err; + } + return 0; +} + +int perf_evlist__pause(struct perf_evlist *evlist) +{ + return perf_evlist__set_paused(evlist, true); +} + +int perf_evlist__resume(struct perf_evlist *evlist) +{ + return perf_evlist__set_paused(evlist, false); +} + /* When check_messup is true, 'end' must points to a good entry */ static union perf_event * perf_mmap__read(struct perf_mmap *md, bool check_messup, u64 start, diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 0d165b1..97090b7 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -136,6 +136,8 @@ void perf_evlist__mmap_read_catchup(struct perf_evlist *evlist, int idx); void perf_evlist__mmap_consume(struct perf_evlist *evlist, int idx); +int perf_evlist__pause(struct perf_evlist *evlist); +int perf_evlist__resume(struct perf_evlist *evlist); int perf_evlist__open(struct perf_evlist *evlist); void perf_evlist__close(struct perf_evlist *evlist);