lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf evlist: Do not pass struct record_opts to perf_evlist__prepare_workload()

Browse Source 
Since it's only used for checking ->pipe_output, we can pass the result
directly.

Now the perf_evlist__prepare_workload() don't have a dependency of
struct perf_record_opts, it can be called from other places like perf
stat.

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-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim
2013-03-11 16:43:16 +09:00
committed by Arnaldo Carvalho de Melo
parent 6ef73ec449
commit 119fa3c922
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-record.c
View File

@@ -475,7 +475,7 @@ 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->target, err = perf_evlist__prepare_workload(evsel_list, &opts->target,
opts, argv); argv, opts->pipe_output);
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;

2
tools/perf/builtin-trace.c
View File

@@ -462,7 +462,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
if (forks) { if (forks) {
err = perf_evlist__prepare_workload(evlist, &trace->opts.target, err = perf_evlist__prepare_workload(evlist, &trace->opts.target,
&trace->opts, argv); argv, false);
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;

2
tools/perf/tests/perf-record.c
View File

@@ -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.target, &opts, argv); err = perf_evlist__prepare_workload(evlist, &opts.target, argv, false);
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;

5
tools/perf/util/evlist.c
View File

@@ -746,8 +746,7 @@ out_err:
int perf_evlist__prepare_workload(struct perf_evlist *evlist, int perf_evlist__prepare_workload(struct perf_evlist *evlist,
struct perf_target *target, struct perf_target *target,
struct perf_record_opts *opts, const char *argv[], bool pipe_output)
const char *argv[])
{ {
int child_ready_pipe[2], go_pipe[2]; int child_ready_pipe[2], go_pipe[2];
char bf; char bf;
@@ -769,7 +768,7 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist,
} }
if (!evlist->workload.pid) { if (!evlist->workload.pid) {
if (opts->pipe_output) if (pipe_output)
dup2(2, 1); dup2(2, 1);
close(child_ready_pipe[0]); close(child_ready_pipe[0]);

3
tools/perf/util/evlist.h
View File

@@ -87,8 +87,7 @@ void perf_evlist__config(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_target *target,
struct perf_record_opts *opts, const char *argv[], bool pipe_output);
const char *argv[]);
int perf_evlist__start_workload(struct perf_evlist *evlist); int perf_evlist__start_workload(struct perf_evlist *evlist);
int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,