Commit-ID: 01c2d99bcf6fc7f6ce3fe3d0fb38b124e1f127fc
Gitweb: http://git.kernel.org/tip/01c2d99bcf6fc7f6ce3fe3d0fb38b124e1f127fc
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Wed, 9 Nov 2011 09:16:26 -0200
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Mon, 28 Nov 2011 10:34:50 -0200
perf record: Move mmap_pages to perf_record_opts
Tools being developed will need this to allow the user to override this
value.
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-zydc1yhxfm0z35fuy95bsn1l@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-record.c | 9 +++++----
tools/perf/perf.h | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 749862d..ffb627d 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -35,9 +35,10 @@ enum write_mode_t {
WRITE_APPEND
};
-static struct perf_record_opts record_opts = {
+struct perf_record_opts record_opts = {
.target_pid = -1,
.target_tid = -1,
+ .mmap_pages = UINT_MAX,
.user_freq = UINT_MAX,
.user_interval = ULLONG_MAX,
.freq = 1000,
@@ -45,7 +46,6 @@ static struct perf_record_opts record_opts = {
};
static unsigned int page_size;
-static unsigned int mmap_pages = UINT_MAX;
static int output;
static const char *output_name = NULL;
static bool group = false;
@@ -272,7 +272,7 @@ try_again:
exit(-1);
}
- if (perf_evlist__mmap(evlist, mmap_pages, false) < 0)
+ if (perf_evlist__mmap(evlist, record_opts.mmap_pages, false) < 0)
die("failed to mmap with %d (%s)\n", errno, strerror(errno));
if (file_new)
@@ -647,7 +647,8 @@ const struct option record_options[] = {
OPT_BOOLEAN('i', "no-inherit", &record_opts.no_inherit,
"child tasks do not inherit counters"),
OPT_UINTEGER('F', "freq", &record_opts.user_freq, "profile at this frequency"),
- OPT_UINTEGER('m', "mmap-pages", &mmap_pages, "number of mmap data pages"),
+ OPT_UINTEGER('m', "mmap-pages", &record_opts.mmap_pages,
+ "number of mmap data pages"),
OPT_BOOLEAN(0, "group", &group,
"put the counters into a counter group"),
OPT_BOOLEAN('g', "call-graph", &record_opts.call_graph,
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 32ee6ca..13c42f3 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -200,6 +200,7 @@ struct perf_record_opts {
bool sample_id_all_avail;
bool system_wide;
unsigned int freq;
+ unsigned int mmap_pages;
unsigned int user_freq;
u64 default_interval;
u64 user_interval;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|