perf trace: Free evlist resources properly on return path
Namhyung Kim [Fri, 15 Mar 2013 05:48:50 +0000 (14:48 +0900)]
The trace_run() function calls several evlist functions but misses some
pair-wise cleanup routines on return path.  Fix it.

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

tools/perf/builtin-trace.c

index 49fedb5..ab3ed4a 100644 (file)
@@ -452,7 +452,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
        err = trace__symbols_init(trace, evlist);
        if (err < 0) {
                printf("Problems initializing symbol libraries!\n");
-               goto out_delete_evlist;
+               goto out_delete_maps;
        }
 
        perf_evlist__config(evlist, &trace->opts);
@@ -465,20 +465,20 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
                                                    argv, false, false);
                if (err < 0) {
                        printf("Couldn't run the workload!\n");
-                       goto out_delete_evlist;
+                       goto out_delete_maps;
                }
        }
 
        err = perf_evlist__open(evlist);
        if (err < 0) {
                printf("Couldn't create the events: %s\n", strerror(errno));
-               goto out_delete_evlist;
+               goto out_delete_maps;
        }
 
        err = perf_evlist__mmap(evlist, UINT_MAX, false);
        if (err < 0) {
                printf("Couldn't mmap the events: %s\n", strerror(errno));
-               goto out_delete_evlist;
+               goto out_close_evlist;
        }
 
        perf_evlist__enable(evlist);
@@ -534,7 +534,7 @@ again:
 
        if (trace->nr_events == before) {
                if (done)
-                       goto out_delete_evlist;
+                       goto out_unmap_evlist;
 
                poll(evlist->pollfd, evlist->nr_fds, -1);
        }
@@ -544,6 +544,12 @@ again:
 
        goto again;
 
+out_unmap_evlist:
+       perf_evlist__munmap(evlist);
+out_close_evlist:
+       perf_evlist__close(evlist);
+out_delete_maps:
+       perf_evlist__delete_maps(evlist);
 out_delete_evlist:
        perf_evlist__delete(evlist);
 out: