Commit 119fa3c9 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

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

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: default avatarNamhyung 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.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6ef73ec4
......@@ -475,7 +475,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
if (forks) {
err = perf_evlist__prepare_workload(evsel_list, &opts->target,
opts, argv);
argv, opts->pipe_output);
if (err < 0) {
pr_err("Couldn't run the workload!\n");
goto out_delete_session;
......
......@@ -462,7 +462,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
if (forks) {
err = perf_evlist__prepare_workload(evlist, &trace->opts.target,
&trace->opts, argv);
argv, false);
if (err < 0) {
printf("Couldn't run the workload!\n");
goto out_delete_evlist;
......
......@@ -93,7 +93,7 @@ int test__PERF_RECORD(void)
* so that we have time to open the evlist (calling sys_perf_event_open
* 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) {
pr_debug("Couldn't run the workload!\n");
goto out_delete_maps;
......
......@@ -746,8 +746,7 @@ int perf_evlist__open(struct perf_evlist *evlist)
int perf_evlist__prepare_workload(struct perf_evlist *evlist,
struct perf_target *target,
struct perf_record_opts *opts,
const char *argv[])
const char *argv[], bool pipe_output)
{
int child_ready_pipe[2], go_pipe[2];
char bf;
......@@ -769,7 +768,7 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist,
}
if (!evlist->workload.pid) {
if (opts->pipe_output)
if (pipe_output)
dup2(2, 1);
close(child_ready_pipe[0]);
......
......@@ -87,8 +87,7 @@ void perf_evlist__config(struct perf_evlist *evlist,
int perf_evlist__prepare_workload(struct perf_evlist *evlist,
struct perf_target *target,
struct perf_record_opts *opts,
const char *argv[]);
const char *argv[], bool pipe_output);
int perf_evlist__start_workload(struct perf_evlist *evlist);
int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment