perf evlist: Add want_signal parameter to perf_evlist__prepare_workload()

In case a caller doesn't want to receive SIGUSR1 when the child failed
to exec().

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-6-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2a43c4423f6ae8034e40dbb835f4cbf78def5440..80cc3ea07788eb7ffe380171e1aff611f27c983b 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -475,7 +475,8 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
 
        if (forks) {
                err = perf_evlist__prepare_workload(evsel_list, &opts->target,
-                                                   argv, opts->pipe_output);
+                                                   argv, opts->pipe_output,
+                                                   true);
                if (err < 0) {
                        pr_err("Couldn't run the workload!\n");
                        goto out_delete_session;

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 3d9944c3d85178fd2405fd2fdc4cf268ba1cb06b..f0c20ef0cd1c458899ddd1ce2d60439031c4873c 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -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,
-                                                   argv, false);
+                                                   argv, false, false);
                if (err < 0) {
                        printf("Couldn't run the workload!\n");
                        goto out_delete_evlist;

diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index a1c41b7d3c071117aeb57eaea6e63bbfd658d247..ffab5a41ff0a33e857d0411ae320b681090ec1c2 100644 (file)
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -93,7 +93,8 @@ 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, argv, false);
+       err = perf_evlist__prepare_workload(evlist, &opts.target, argv,
+                                           false, false);
        if (err < 0) {
                pr_debug("Couldn't run the workload!\n");
                goto out_delete_maps;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 9a337f091b228122e322fd6681834c9f4a3179f6..5b012b8d7a1415f5d30e09cec19664c77439905a 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -746,7 +746,8 @@ out_err:
 
 int perf_evlist__prepare_workload(struct perf_evlist *evlist,
                                  struct perf_target *target,
-                                 const char *argv[], bool pipe_output)
+                                 const char *argv[], bool pipe_output,
+                                 bool want_signal)
 {
        int child_ready_pipe[2], go_pipe[2];
        char bf;
@@ -796,7 +797,8 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist,
                execvp(argv[0], (char **)argv);
 
                perror(argv[0]);
-               kill(getppid(), SIGUSR1);
+               if (want_signal)
+                       kill(getppid(), SIGUSR1);
                exit(-1);
        }
 

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 276a5acc56e631c0c43ce445b4b65c53577aea84..c096da7d6d58824546e0ee6819eeb77ec7622a31 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -87,7 +87,8 @@ void perf_evlist__config(struct perf_evlist *evlist,
 
 int perf_evlist__prepare_workload(struct perf_evlist *evlist,
                                  struct perf_target *target,
-                                 const char *argv[], bool pipe_output);
+                                 const char *argv[], bool pipe_output,
+                                 bool want_signal);
 int perf_evlist__start_workload(struct perf_evlist *evlist);
 
 int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,