summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-11-09 09:16:26 -0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-11-28 10:34:50 -0200
commit01c2d99bcf6fc7f6ce3fe3d0fb38b124e1f127fc (patch)
treea82dbbcdd444ae999ab2985a81c9d31b81497e36 /tools
parent50a682ce875f91e04c81ae5680535aba5a770bad (diff)
downloadlinux-01c2d99bcf6fc7f6ce3fe3d0fb38b124e1f127fc.tar.bz2
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@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-zydc1yhxfm0z35fuy95bsn1l@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-record.c9
-rw-r--r--tools/perf/perf.h1
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 749862d57a83..ffb627d40210 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 32ee6ca8eabd..13c42f34e8b3 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;