lkml.org 
[lkml]   [2015]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/8] perf mem: Fill in the missing session freeing after an error occurs
    Date
    From: Taeung Song <treeze.taeung@gmail.com>

    When an error occurs an error value is just returned without freeing the
    session. So allocating and freeing session have to be matched as a pair
    even if an error occurs.

    Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Link: http://lkml.kernel.org/r/1435752499-11752-1-git-send-email-treeze.taeung@gmail.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-mem.c | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
    index da2ec06f0742..80170aace5d4 100644
    --- a/tools/perf/builtin-mem.c
    +++ b/tools/perf/builtin-mem.c
    @@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem)
    .mode = PERF_DATA_MODE_READ,
    .force = mem->force,
    };
    - int err = -EINVAL;
    int ret;
    struct perf_session *session = perf_session__new(&file, false,
    &mem->tool);
    @@ -135,24 +134,21 @@ static int report_raw_events(struct perf_mem *mem)
    if (mem->cpu_list) {
    ret = perf_session__cpu_bitmap(session, mem->cpu_list,
    mem->cpu_bitmap);
    - if (ret)
    + if (ret < 0)
    goto out_delete;
    }

    - if (symbol__init(&session->header.env) < 0)
    - return -1;
    + ret = symbol__init(&session->header.env);
    + if (ret < 0)
    + goto out_delete;

    printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");

    - err = perf_session__process_events(session);
    - if (err)
    - return err;
    -
    - return 0;
    + ret = perf_session__process_events(session);

    out_delete:
    perf_session__delete(session);
    - return err;
    + return ret;
    }

    static int report_events(int argc, const char **argv, struct perf_mem *mem)
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-07-01 23:41    [W:4.072 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site