perf trace: Drop addr_location refcounts
authorArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 20 Oct 2018 12:18:50 +0000 (09:18 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 22 Oct 2018 15:37:51 +0000 (12:37 -0300)
When we use machine__resolve() we grab a reference to
addr_location.thread (and in the future to other elements there) via
machine__findnew_thread(), so we must pair that with
addr_location__put(), else we'll never drop that thread when it exits
and no other remaining data structures have pointers to it. Fix it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-ivg9hifzeuokb1f5jxc2wob4@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-trace.c

index 74638034861ca168e1fadac5cb8951318d2629e5..77b8748ad5edbfe149a86fb8ff3fc5b5ff9a36fe 100644 (file)
@@ -1814,12 +1814,14 @@ static int trace__resolve_callchain(struct trace *trace, struct perf_evsel *evse
        int max_stack = evsel->attr.sample_max_stack ?
                        evsel->attr.sample_max_stack :
                        trace->max_stack;
+       int err;
 
-       if (machine__resolve(trace->host, &al, sample) < 0 ||
-           thread__resolve_callchain(al.thread, cursor, evsel, sample, NULL, NULL, max_stack))
+       if (machine__resolve(trace->host, &al, sample) < 0)
                return -1;
 
-       return 0;
+       err = thread__resolve_callchain(al.thread, cursor, evsel, sample, NULL, NULL, max_stack);
+       addr_location__put(&al);
+       return err;
 }
 
 static int trace__fprintf_callchain(struct trace *trace, struct perf_sample *sample)