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

Commit 6ef73ec4 authored Mar 11, 2013 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Mar 15, 2013

perf evlist: Pass struct perf_target to perf_evlist__prepare_workload()



It's a preparation step of removing @opts arg from the function so that
it can be used more widely.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1362987798-24969-4-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent b3a319d5

tools/perf/builtin-record.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -474,7 +474,8 @@ static int __cmd_record(struct perf_record rec, int argc, const char *argv)
	}		}

	if (forks) {		if (forks) {
	err = perf_evlist__prepare_workload(evsel_list, opts, argv);		err = perf_evlist__prepare_workload(evsel_list, &opts->target,
			opts, argv);
	if (err < 0) {		if (err < 0) {
	pr_err("Couldn't run the workload!\n");		pr_err("Couldn't run the workload!\n");
	goto out_delete_session;		goto out_delete_session;

tools/perf/builtin-trace.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -461,7 +461,8 @@ static int trace__run(struct trace trace, int argc, const char *argv)
	signal(SIGINT, sig_handler);		signal(SIGINT, sig_handler);

	if (forks) {		if (forks) {
	err = perf_evlist__prepare_workload(evlist, &trace->opts, argv);		err = perf_evlist__prepare_workload(evlist, &trace->opts.target,
			&trace->opts, argv);
	if (err < 0) {		if (err < 0) {
	printf("Couldn't run the workload!\n");		printf("Couldn't run the workload!\n");
	goto out_delete_evlist;		goto out_delete_evlist;

tools/perf/tests/perf-record.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@ int test__PERF_RECORD(void)
	* so that we have time to open the evlist (calling sys_perf_event_open		* so that we have time to open the evlist (calling sys_perf_event_open
	* on all the fds) and then mmap them.		* on all the fds) and then mmap them.
	*/		*/
	err = perf_evlist__prepare_workload(evlist, &opts, argv);		err = perf_evlist__prepare_workload(evlist, &opts.target, &opts, argv);
	if (err < 0) {		if (err < 0) {
	pr_debug("Couldn't run the workload!\n");		pr_debug("Couldn't run the workload!\n");
	goto out_delete_maps;		goto out_delete_maps;

tools/perf/util/evlist.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -745,6 +745,7 @@ int perf_evlist__open(struct perf_evlist *evlist)
	}		}

	int perf_evlist__prepare_workload(struct perf_evlist *evlist,		int perf_evlist__prepare_workload(struct perf_evlist *evlist,
			struct perf_target *target,
	struct perf_record_opts *opts,		struct perf_record_opts *opts,
	const char *argv[])		const char *argv[])
	{		{
	@@ -800,7 +801,7 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist,
	exit(-1);		exit(-1);
	}		}

	if (perf_target__none(&opts->target))		if (perf_target__none(target))
	evlist->threads->map[0] = evlist->workload.pid;		evlist->threads->map[0] = evlist->workload.pid;

	close(child_ready_pipe[1]);		close(child_ready_pipe[1]);

tools/perf/util/evlist.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,7 @@ void perf_evlist__config(struct perf_evlist *evlist,
	struct perf_record_opts *opts);		struct perf_record_opts *opts);

	int perf_evlist__prepare_workload(struct perf_evlist *evlist,		int perf_evlist__prepare_workload(struct perf_evlist *evlist,
			struct perf_target *target,
	struct perf_record_opts *opts,		struct perf_record_opts *opts,
	const char *argv[]);		const char *argv[]);
	int perf_evlist__start_workload(struct perf_evlist *evlist);		int perf_evlist__start_workload(struct perf_evlist *evlist);