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

Commit e5b2c207 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Export usage string and option table of perf record 



Those are shared with other builtin commands like kvm, script.  So
make it accessable from them.  This is a preparation of later change
that limiting possible options.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarHemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1413990949-13953-3-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-record.c

+5 −2
Original line number Diff line number Diff line
@@ -680,11 +680,12 @@ static int perf_record_config(const char *var, const char *value, void *cb) 
	return perf_default_config(var, value, cb);

}



static const char * const record_usage[] = {

static const char * const __record_usage[] = {

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

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

	NULL

};

const char * const *record_usage = __record_usage;



/*

 * XXX Ideally would be local to cmd_record() and passed to a record__new
@@ -725,7 +726,7 @@ const char record_callchain_help[] = CALLCHAIN_HELP "fp"; 
 * perf_evlist__prepare_workload, etc instead of fork+exec'in 'perf record',

 * using pipes, etc.

 */

const struct option record_options[] = {

struct option __record_options[] = {

	OPT_CALLBACK('e', "event", &record.evlist, "event",

		     "event selector. use 'perf list' to list available events",

		     parse_events_option),
@@ -802,6 +803,8 @@ const struct option record_options[] = { 
	OPT_END()

};



struct option *record_options = __record_options;



int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)

{

	int err = -ENOMEM;

tools/perf/builtin-script.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ static char const *generate_script_lang; 
static bool			debug_mode;

static u64			last_timestamp;

static u64			nr_unordered;

extern const struct option	record_options[];

static bool			no_callchain;

static bool			latency_format;

static bool			system_wide;

tools/perf/builtin-timechart.c

+4 −3
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ int cmd_timechart(int argc, const char **argv, 
		NULL

	};



	const struct option record_options[] = {

	const struct option timechart_record_options[] = {

	OPT_BOOLEAN('P', "power-only", &tchart.power_only, "output power data only"),

	OPT_BOOLEAN('T', "tasks-only", &tchart.tasks_only,

		    "output processes data only"),
@@ -1972,7 +1972,7 @@ int cmd_timechart(int argc, const char **argv, 
	OPT_BOOLEAN('g', "callchain", &tchart.with_backtrace, "record callchain"),

	OPT_END()

	};

	const char * const record_usage[] = {

	const char * const timechart_record_usage[] = {

		"perf timechart record [<options>]",

		NULL

	};
@@ -1985,7 +1985,8 @@ int cmd_timechart(int argc, const char **argv, 
	}



	if (argc && !strncmp(argv[0], "rec", 3)) {

		argc = parse_options(argc, argv, record_options, record_usage,

		argc = parse_options(argc, argv, timechart_record_options,

				     timechart_record_usage,

				     PARSE_OPT_STOP_AT_NON_OPTION);



		if (tchart.power_only && tchart.tasks_only) {

tools/perf/perf.h

+3 −0
Original line number Diff line number Diff line
@@ -62,4 +62,7 @@ struct record_opts { 
	unsigned     initial_delay;

};



struct option;

extern const char * const *record_usage;

extern struct option *record_options;

#endif