Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c2d99b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 50a682ce

tools/perf/builtin-record.c

+5 −4
Original line number Diff line number Diff line
@@ -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,

tools/perf/perf.h

+1 −0
Original line number Diff line number Diff line
@@ -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;