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

Commit 602ad878 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf target: Shorten perf_target__ to target__ 



Getting unwieldly long, for this app domain should be descriptive enough
and the use of __ to separate the class from the method names should
help with avoiding clashes with other code bases.

Reported-by: default avatarDavid Ahern <dsahern@gmail.com>
Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20131112113427.GA4053@ghostprotocols.net


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

tools/perf/builtin-kvm.c

+3 −3
Original line number Diff line number Diff line
@@ -1510,13 +1510,13 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, 
	/*

	 * target related setups

	 */

	err = perf_target__validate(&kvm->opts.target);

	err = target__validate(&kvm->opts.target);

	if (err) {

		perf_target__strerror(&kvm->opts.target, err, errbuf, BUFSIZ);

		target__strerror(&kvm->opts.target, err, errbuf, BUFSIZ);

		ui__warning("%s", errbuf);

	}



	if (perf_target__none(&kvm->opts.target))

	if (target__none(&kvm->opts.target))

		kvm->opts.target.system_wide = true;

tools/perf/builtin-record.c

+7 −7
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) 
	 * (apart from group members) have enable_on_exec=1 set,

	 * so don't spoil it by prematurely enabling them.

	 */

	if (!perf_target__none(&opts->target))

	if (!target__none(&opts->target))

		perf_evlist__enable(evsel_list);



	/*
@@ -535,7 +535,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) 
		 * die with the process and we wait for that. Thus no need to

		 * disable events in this case.

		 */

		if (done && !disabled && !perf_target__none(&opts->target)) {

		if (done && !disabled && !target__none(&opts->target)) {

			perf_evlist__disable(evsel_list);

			disabled = true;

		}
@@ -906,7 +906,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) 


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

			    PARSE_OPT_STOP_AT_NON_OPTION);

	if (!argc && perf_target__none(&rec->opts.target))

	if (!argc && target__none(&rec->opts.target))

		usage_with_options(record_usage, record_options);



	if (nr_cgroups && !rec->opts.target.system_wide) {
@@ -936,17 +936,17 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) 
		goto out_symbol_exit;

	}



	err = perf_target__validate(&rec->opts.target);

	err = target__validate(&rec->opts.target);

	if (err) {

		perf_target__strerror(&rec->opts.target, err, errbuf, BUFSIZ);

		target__strerror(&rec->opts.target, err, errbuf, BUFSIZ);

		ui__warning("%s", errbuf);

	}



	err = perf_target__parse_uid(&rec->opts.target);

	err = target__parse_uid(&rec->opts.target);

	if (err) {

		int saved_errno = errno;



		perf_target__strerror(&rec->opts.target, err, errbuf, BUFSIZ);

		target__strerror(&rec->opts.target, err, errbuf, BUFSIZ);

		ui__error("%s", errbuf);



		err = -saved_errno;

tools/perf/builtin-stat.c

+10 −11
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ enum { 


static struct perf_evlist	*evsel_list;



static struct perf_target	target = {

static struct target target = {

	.uid	= UINT_MAX,

};
@@ -294,11 +294,10 @@ static int create_perf_stat_counter(struct perf_evsel *evsel) 


	attr->inherit = !no_inherit;



	if (perf_target__has_cpu(&target))

	if (target__has_cpu(&target))

		return perf_evsel__open_per_cpu(evsel, perf_evsel__cpus(evsel));



	if (!perf_target__has_task(&target) &&

	    perf_evsel__is_group_leader(evsel)) {

	if (!target__has_task(&target) && perf_evsel__is_group_leader(evsel)) {

		attr->disabled = 1;

		if (!initial_delay)

			attr->enable_on_exec = 1;
@@ -1236,7 +1235,7 @@ static void print_stat(int argc, const char **argv) 
			fprintf(output, "\'system wide");

		else if (target.cpu_list)

			fprintf(output, "\'CPU(s) %s", target.cpu_list);

		else if (!perf_target__has_task(&target)) {

		else if (!target__has_task(&target)) {

			fprintf(output, "\'%s", argv[0]);

			for (i = 1; i < argc; i++)

				fprintf(output, " %s", argv[i]);
@@ -1667,7 +1666,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) 
	} else if (big_num_opt == 0) /* User passed --no-big-num */

		big_num = false;



	if (!argc && perf_target__none(&target))

	if (!argc && target__none(&target))

		usage_with_options(stat_usage, options);



	if (run_count < 0) {
@@ -1680,8 +1679,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) 
	}



	/* no_aggr, cgroup are for system-wide only */

	if ((aggr_mode != AGGR_GLOBAL || nr_cgroups)

	     && !perf_target__has_cpu(&target)) {

	if ((aggr_mode != AGGR_GLOBAL || nr_cgroups) &&

	    !target__has_cpu(&target)) {

		fprintf(stderr, "both cgroup and no-aggregation "

			"modes only available in system-wide mode\n");
@@ -1694,14 +1693,14 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (add_default_attributes())

		goto out;



	perf_target__validate(&target);

	target__validate(&target);



	if (perf_evlist__create_maps(evsel_list, &target) < 0) {

		if (perf_target__has_task(&target)) {

		if (target__has_task(&target)) {

			pr_err("Problems finding threads of monitor\n");

			parse_options_usage(stat_usage, options, "p", 1);

			parse_options_usage(NULL, options, "t", 1);

		} else if (perf_target__has_cpu(&target)) {

		} else if (target__has_cpu(&target)) {

			perror("failed to parse CPUs map");

			parse_options_usage(stat_usage, options, "C", 1);

			parse_options_usage(NULL, options, "a", 1);

tools/perf/builtin-top.c

+7 −7
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ static int __cmd_top(struct perf_top *top) 
	 * XXX 'top' still doesn't start workloads like record, trace, but should,

	 * so leave the check here.

	 */

        if (!perf_target__none(&opts->target))

        if (!target__none(&opts->target))

                perf_evlist__enable(top->evlist);



	/* Wait for a minimal set of events before starting the snapshot */
@@ -1053,7 +1053,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
		.sym_pcnt_filter     = 5,

	};

	struct perf_record_opts *opts = &top.record_opts;

	struct perf_target *target = &opts->target;

	struct target *target = &opts->target;

	const struct option options[] = {

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

		     "event selector. use 'perf list' to list available events",
@@ -1169,24 +1169,24 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 


	setup_browser(false);



	status = perf_target__validate(target);

	status = target__validate(target);

	if (status) {

		perf_target__strerror(target, status, errbuf, BUFSIZ);

		target__strerror(target, status, errbuf, BUFSIZ);

		ui__warning("%s", errbuf);

	}



	status = perf_target__parse_uid(target);

	status = target__parse_uid(target);

	if (status) {

		int saved_errno = errno;



		perf_target__strerror(target, status, errbuf, BUFSIZ);

		target__strerror(target, status, errbuf, BUFSIZ);

		ui__error("%s", errbuf);



		status = -saved_errno;

		goto out_delete_evlist;

	}



	if (perf_target__none(target))

	if (target__none(target))

		target->system_wide = true;



	if (perf_evlist__create_maps(top.evlist, target) < 0)

tools/perf/builtin-trace.c

+5 −5
Original line number Diff line number Diff line
@@ -2327,21 +2327,21 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) 
		}

	}



	err = perf_target__validate(&trace.opts.target);

	err = target__validate(&trace.opts.target);

	if (err) {

		perf_target__strerror(&trace.opts.target, err, bf, sizeof(bf));

		target__strerror(&trace.opts.target, err, bf, sizeof(bf));

		fprintf(trace.output, "%s", bf);

		goto out_close;

	}



	err = perf_target__parse_uid(&trace.opts.target);

	err = target__parse_uid(&trace.opts.target);

	if (err) {

		perf_target__strerror(&trace.opts.target, err, bf, sizeof(bf));

		target__strerror(&trace.opts.target, err, bf, sizeof(bf));

		fprintf(trace.output, "%s", bf);

		goto out_close;

	}



	if (!argc && perf_target__none(&trace.opts.target))

	if (!argc && target__none(&trace.opts.target))

		trace.opts.target.system_wide = true;



	if (input_name)