Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1432319
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 08/18] perf record: Move mmap setup block to separate function |
| Date | 2016-06-27 23:10 +0200 |
| Message-ID | <rOLX4-5DX-33@gated-at.bofh.it> (permalink) |
| References | <rOLX3-5DX-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Wang Nan <wangnan0@huawei.com>
Following commits introduce multiple evlists to record. This patch
extracts perf_evlist__mmap_ex() processing to a new function, creates
record__mmap() and record__mmap_evlist() to wrap perf_evlist__mmap_ex()
and its error processing. They will be improvemented to create mmap for
all evlists.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1467023052-146749-2-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-record.c | 56 +++++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 20 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 81411b14df4c..7eb8d7d29fbc 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -342,6 +342,40 @@ int auxtrace_record__snapshot_start(struct auxtrace_record *itr __maybe_unused)
#endif
+static int record__mmap_evlist(struct record *rec,
+ struct perf_evlist *evlist)
+{
+ struct record_opts *opts = &rec->opts;
+ char msg[512];
+
+ if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
+ opts->auxtrace_mmap_pages,
+ opts->auxtrace_snapshot_mode) < 0) {
+ if (errno == EPERM) {
+ pr_err("Permission error mapping pages.\n"
+ "Consider increasing "
+ "/proc/sys/kernel/perf_event_mlock_kb,\n"
+ "or try again with a smaller value of -m/--mmap_pages.\n"
+ "(current value: %u,%u)\n",
+ opts->mmap_pages, opts->auxtrace_mmap_pages);
+ return -errno;
+ } else {
+ pr_err("failed to mmap with %d (%s)\n", errno,
+ strerror_r(errno, msg, sizeof(msg)));
+ if (errno)
+ return -errno;
+ else
+ return -EINVAL;
+ }
+ }
+ return 0;
+}
+
+static int record__mmap(struct record *rec)
+{
+ return record__mmap_evlist(rec, rec->evlist);
+}
+
static int record__open(struct record *rec)
{
char msg[512];
@@ -378,27 +412,9 @@ try_again:
goto out;
}
- if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
- opts->auxtrace_mmap_pages,
- opts->auxtrace_snapshot_mode) < 0) {
- if (errno == EPERM) {
- pr_err("Permission error mapping pages.\n"
- "Consider increasing "
- "/proc/sys/kernel/perf_event_mlock_kb,\n"
- "or try again with a smaller value of -m/--mmap_pages.\n"
- "(current value: %u,%u)\n",
- opts->mmap_pages, opts->auxtrace_mmap_pages);
- rc = -errno;
- } else {
- pr_err("failed to mmap with %d (%s)\n", errno,
- strerror_r(errno, msg, sizeof(msg)));
- if (errno)
- rc = -errno;
- else
- rc = -EINVAL;
- }
+ rc = record__mmap(rec);
+ if (rc)
goto out;
- }
session->evlist = evlist;
perf_session__set_id_hdr_size(session);
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 09/18] perf record: Prepare reading from multiple evlists in record__mmap_read_all() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 16/18] perf data ctf: Generate comm event to CTF output Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 06/18] perf build: Add libbabeltrace to build-test Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 08/18] perf record: Move mmap setup block to separate function Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 11/18] perf symbols: Use proper dso name for is_regular_file Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 13/18] perf data ctf: Pass convert options through opts structure Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 07/18] perf data convert: Include config.h header Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 15/18] perf data ctf: Prepare collect non-sample events Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 12/18] perf data ctf: Add value_set_string() helper Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 18/18] perf data ctf: Generate fork and exit events to CTF output Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 17/18] perf data ctf: Add '--all' option for 'perf data convert' Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
[PATCH 02/18] perf tools: Update makefile message for installing slang devel package Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-27 23:10 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-06-28 09:10 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Jiri Olsa <jolsa@redhat.com> - 2016-06-28 10:30 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-28 16:10 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-28 16:20 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-06-29 11:40 +0200
csiph-web