perf session: Fill in the missing freeing a session after an error occur
PATCH 1/1 perf session: Fill in the missing freeing a session after an error occur
In some cases some sessions aren't freed.
For example, a session is allocated and then
if an error occur, just a error value is returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.
--- tools/perf/builtin-inject.c | 7 ++++--- tools/perf/builtin-kmem.c | 4 ++-- tools/perf/builtin-kvm.c | 16 ++++++++++++---- tools/perf/builtin-mem.c | 17 ++++++++++------- tools/perf/builtin-report.c | 6 ++++-- 5 files changed, 32 insertions(+), 18 deletions(-)
tools/perf/builtin-inject.c +4 -3
@@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)if (inject.session ==NULL )return -1 ; -if (symbol__init (&inject.session->header.env) <0 ) -return -1 ; + ret =symbol__init (&inject.session->header.env); +if (ret <0 ) + goto out_delete; ret =__cmd_inject (&inject); +out_delete:perf_session__delete (inject.session); -return ret; }
tools/perf/builtin-kmem.c +2 -2
@@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)if (!perf_evlist__find_tracepoint_by_name (session->evlist,"kmem:kmalloc" )) {pr_err (errmsg,"slab" ,"slab" ); -return -1 ; + goto out_delete; } }
@@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) "kmem:mm_page_alloc");if (evsel ==NULL ) {pr_err (errmsg,"page" ,"page" ); -return -1 ; + goto out_delete; } kmem_page_size =pevent_get_page_size (evsel->tp_format->pevent);
tools/perf/builtin-kvm.c +12 -4
@@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm)symbol__init (&kvm->session->header.env); -if (!perf_session__has_traces (kvm->session,"kvm record" )) -return -EINVAL ; +if (!perf_session__has_traces (kvm->session,"kvm record" )) { + ret = -EINVAL ; + goto out_delete; + }/* * Do not use 'isa' recorded in kvm_exit tracepoint since it is not
@@ -1070,9 +1072,15 @@ static int read_events(struct perf_kvm_stat *kvm)*/ ret =cpu_isa_config (kvm);if (ret <0 ) -return ret; + goto out_delete; -return perf_session__process_events (kvm->session); + ret =perf_session__process_events (kvm->session); +if (ret <0 ) + goto out_delete; + +out_delete: +perf_session__delete (kvm->session); +return ret; }static int parse_target_str (struct perf_kvm_stat *kvm)
tools/perf/builtin-mem.c +10 -7
@@ -135,24 +135,27 @@ 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) { + ret = err; 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 = err; +else + ret =0 ; out_delete:perf_session__delete (session); -return err; +return ret; }static int report_events (int argc,const char **argv,struct perf_mem *mem)
tools/perf/builtin-report.c +4 -2
@@ -828,8 +828,10 @@ repeat:if (report.header || report.header_only) {perf_session__fprintf_info (session, stdout, report.show_full_info); -if (report.header_only) -return 0 ; +if (report.header_only) { + ret =0 ; + goto error; + } }else if (use_browser ==0 ) {fputs ("# To display the perf.data header info, please use --header/--header-only options.\n#\n" , stdout);
Signature · 1 line
1.9.1
Arnaldo Carvalho de Melo
maintainerEm Sat, Jun 27, 2015 at 11:08:52PM +0900, taeung escreveu:
Quoted 14 lines
In some cases some sessions aren't freed.
For example, a session is allocated and then
if an error occur, just a error value is returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.Signed-off-by taeung <[email protected]>--- tools/perf/builtin-inject.c | 7 ++++--- tools/perf/builtin-kmem.c | 4 ++-- tools/perf/builtin-kvm.c | 16 ++++++++++++---- tools/perf/builtin-mem.c | 17 ++++++++++------- tools/perf/builtin-report.c | 6 ++++-- 5 files changed, 32 insertions(+), 18 deletions(-)
<SNIP>
tools/perf/builtin-mem.c static int report_raw_events(struct perf_mem *mem) · line 140
Quoted 9 lines
+++
b/tools/perf/builtin-mem.ctools/perf/builtin-mem.c +2
-1@@ -135,24 +135,27 @@ 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) { + ret = err; goto out_delete;
How come?
Can you break this into per-tool patches? If that would be the case I would have applied some now.
- Arnaldo
Quoted 46 lines
tools/perf/builtin-mem.c +8
-6+ } } -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 = err; +else + ret =0 ; out_delete:perf_session__delete (session); -return err; +return ret; }static int report_events (int argc,const char **argv,struct perf_mem *mem)tools/perf/builtin-report.c +4
-2@@ -828,8 +828,10 @@ repeat:if (report.header || report.header_only) {perf_session__fprintf_info (session, stdout, report.show_full_info); -if (report.header_only) -return 0 ; +if (report.header_only) { + ret =0 ; + goto error; + } }else if (use_browser ==0 ) {fputs ("# To display the perf.data header info, please use --header/--header-only options.\n#\n" , stdout);Signature · 1 line
1.9.1