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

Commit e9db1310 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Extend -m option for AUX area tracing mmap pages 



Extend the -m option so that the number of mmap pages for AUX area
tracing can be specified by adding a comma followed by the number of
pages.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1428594864-29309-7-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ef149c25

tools/perf/Documentation/perf-record.txt

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ OPTIONS 
	Number of mmap data pages (must be a power of two) or size

	specification with appended unit character - B/K/M/G. The

	size is rounded up to have nearest pages power of two value.

	Also, by adding a comma, the number of mmap pages for AUX

	area tracing can be specified.



--group::

	Put all events in a single event group.  This precedes the --event

tools/perf/builtin-record.c

+46 −3
Original line number Diff line number Diff line
@@ -855,6 +855,49 @@ static int parse_clockid(const struct option *opt, const char *str, int unset) 
	return -1;

}



static int record__parse_mmap_pages(const struct option *opt,

				    const char *str,

				    int unset __maybe_unused)

{

	struct record_opts *opts = opt->value;

	char *s, *p;

	unsigned int mmap_pages;

	int ret;



	if (!str)

		return -EINVAL;



	s = strdup(str);

	if (!s)

		return -ENOMEM;



	p = strchr(s, ',');

	if (p)

		*p = '\0';



	if (*s) {

		ret = __perf_evlist__parse_mmap_pages(&mmap_pages, s);

		if (ret)

			goto out_free;

		opts->mmap_pages = mmap_pages;

	}



	if (!p) {

		ret = 0;

		goto out_free;

	}



	ret = __perf_evlist__parse_mmap_pages(&mmap_pages, p + 1);

	if (ret)

		goto out_free;



	opts->auxtrace_mmap_pages = mmap_pages;



out_free:

	free(s);

	return ret;

}



static const char * const __record_usage[] = {

	"perf record [<options>] [<command>]",

	"perf record [<options>] -- <command> [<options>]",
@@ -935,9 +978,9 @@ struct option __record_options[] = { 
			&record.opts.no_inherit_set,

			"child tasks do not inherit counters"),

	OPT_UINTEGER('F', "freq", &record.opts.user_freq, "profile at this frequency"),

	OPT_CALLBACK('m', "mmap-pages", &record.opts.mmap_pages, "pages",

		     "number of mmap data pages",

		     perf_evlist__parse_mmap_pages),

	OPT_CALLBACK('m', "mmap-pages", &record.opts, "pages[,pages]",

		     "number of mmap data pages and AUX area tracing mmap pages",

		     record__parse_mmap_pages),

	OPT_BOOLEAN(0, "group", &record.opts.group,

		    "put the counters into a counter group"),

	OPT_CALLBACK_NOOPT('g', NULL, &record.opts,

tools/perf/util/evlist.c

+7 −3
Original line number Diff line number Diff line
@@ -1000,10 +1000,8 @@ static long parse_pages_arg(const char *str, unsigned long min, 
	return pages;

}



int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,

				  int unset __maybe_unused)

int __perf_evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str)

{

	unsigned int *mmap_pages = opt->value;

	unsigned long max = UINT_MAX;

	long pages;
@@ -1020,6 +1018,12 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str, 
	return 0;

}



int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,

				  int unset __maybe_unused)

{

	return __perf_evlist__parse_mmap_pages(opt->value, str);

}



/**

 * perf_evlist__mmap_ex - Create mmaps to receive events.

 * @evlist: list of events

tools/perf/util/evlist.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ int perf_evlist__start_workload(struct perf_evlist *evlist); 


struct option;



int __perf_evlist__parse_mmap_pages(unsigned int *mmap_pages, const char *str);

int perf_evlist__parse_mmap_pages(const struct option *opt,

				  const char *str,

				  int unset);