lkml.org 
[lkml]   [2013]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] perf evlist: Add want_signal parameter to perf_evlist__prepare_workload()
    Date
    From: Namhyung Kim <namhyung.kim@lge.com>

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

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/builtin-record.c | 3 ++-
    tools/perf/builtin-trace.c | 2 +-
    tools/perf/tests/perf-record.c | 3 ++-
    tools/perf/util/evlist.c | 6 ++++--
    tools/perf/util/evlist.h | 3 ++-
    5 files changed, 11 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index 2a43c4423f6a..80cc3ea07788 100644
    --- 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 3d9944c3d851..f0c20ef0cd1c 100644
    --- 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 a1c41b7d3c07..ffab5a41ff0a 100644
    --- 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 9a337f091b22..5b012b8d7a14 100644
    --- 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 276a5acc56e6..c096da7d6d58 100644
    --- 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,
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-03-11 09:21    [W:4.263 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site