hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf mem: Fill in the missing session freeing after an error occurs 

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>
This commit is contained in:
Taeung Song 2015-07-01 21:08:19 +09:00 committed by Arnaldo Carvalho de Melo
parent 41b983609a
commit 1df9fade87
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/perf/builtin-mem.c
View File

@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem)
.mode = PERF_DATA_MODE_READ, .mode = PERF_DATA_MODE_READ,
.force = mem->force, .force = mem->force,
}; };
int err = -EINVAL;
int ret; int ret;
struct perf_session *session = perf_session__new(&file, false, struct perf_session *session = perf_session__new(&file, false,
&mem->tool); &mem->tool);
@ -135,24 +134,21 @@ static int report_raw_events(struct perf_mem *mem)
if (mem->cpu_list) { if (mem->cpu_list) {
ret = perf_session__cpu_bitmap(session, mem->cpu_list, ret = perf_session__cpu_bitmap(session, mem->cpu_list,
mem->cpu_bitmap); mem->cpu_bitmap);
if (ret) if (ret < 0)
goto out_delete; goto out_delete;
} }
if (symbol__init(&session->header.env) < 0) ret = symbol__init(&session->header.env);
return -1; if (ret < 0)
goto out_delete;
printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n"); printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");
err = perf_session__process_events(session); ret = perf_session__process_events(session);
if (err)
return err;
return 0;
out_delete: out_delete:
perf_session__delete(session); perf_session__delete(session);
return err; return ret;
} }
static int report_events(int argc, const char **argv, struct perf_mem *mem) static int report_events(int argc, const char **argv, struct perf_mem *mem)