From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbdJXKOu (ORCPT ); Tue, 24 Oct 2017 06:14:50 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48381 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751753AbdJXKOr (ORCPT ); Tue, 24 Oct 2017 06:14:47 -0400 Date: Tue, 24 Oct 2017 03:12:36 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, dsahern@gmail.com, wangnan0@huawei.com, jolsa@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, namhyung@kernel.org Reply-To: hpa@zytor.com, dsahern@gmail.com, wangnan0@huawei.com, jolsa@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Make record__mmap_read generic Git-Commit-ID: d37f1586d0023443e2e64937769bbb1bc078866a 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: d37f1586d0023443e2e64937769bbb1bc078866a Gitweb: https://git.kernel.org/tip/d37f1586d0023443e2e64937769bbb1bc078866a Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 5 Oct 2017 16:39:55 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Oct 2017 11:20:54 -0300 perf record: Make record__mmap_read generic It becomes a perf_mmap method, "push", that build reads from a mmap and "pushes" it to a consumer, that in the initial case, for 'perf record', just writes it to the perf.data file descriptor, but may be used by 'top', etc. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-u4l1qjbi6l76r2k0nv99220n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 234fdf4..47a7611 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -176,9 +176,16 @@ rb_find_range(void *data, int mask, u64 head, u64 old, return backward_rb_find_range(data, mask, head, start, end); } -static int -record__mmap_read(struct record *rec, struct perf_mmap *md, - bool overwrite, bool backward) +static int record__pushfn(void *to, void *bf, size_t size) +{ + struct record *rec = to; + + rec->samples++; + return record__write(rec, bf, size); +} + +static int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward, + void *to, int push(void *to, void *buf, size_t size)) { u64 head = perf_mmap__read_head(md); u64 old = md->prev; @@ -195,8 +202,6 @@ record__mmap_read(struct record *rec, struct perf_mmap *md, if (start == end) return 0; - rec->samples++; - size = end - start; if (size > (unsigned long)(md->mask) + 1) { WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n"); @@ -211,7 +216,7 @@ record__mmap_read(struct record *rec, struct perf_mmap *md, size = md->mask + 1 - (start & md->mask); start += size; - if (record__write(rec, buf, size) < 0) { + if (push(to, buf, size) < 0) { rc = -1; goto out; } @@ -221,7 +226,7 @@ record__mmap_read(struct record *rec, struct perf_mmap *md, size = end - start; start += size; - if (record__write(rec, buf, size) < 0) { + if (push(to, buf, size) < 0) { rc = -1; goto out; } @@ -576,8 +581,7 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap; if (maps[i].base) { - if (record__mmap_read(rec, &maps[i], - evlist->overwrite, backward) != 0) { + if (perf_mmap__push(&maps[i], evlist->overwrite, backward, rec, record__pushfn) != 0) { rc = -1; goto out; }