diff options
| author | Namhyung Kim <namhyung.kim@lge.com> | 2013-04-01 13:35:18 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-28 15:23:52 +0200 |
| commit | ceb2acbc2c1387c8785b3c98b482f5a2b89447c3 (patch) | |
| tree | 9ab10db348d838c9bccaa2fdee6561125d64a85f /tools/perf | |
| parent | perf hists: Fix an invalid memory free on he->branch_info (diff) | |
| download | linux-ceb2acbc2c1387c8785b3c98b482f5a2b89447c3.tar.xz linux-ceb2acbc2c1387c8785b3c98b482f5a2b89447c3.zip | |
perf hists: Free unused mem info of a matched hist entry
The mem info is shared between matched entries so one should be freed.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.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>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1364816125-12212-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/hist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 9438d576459d..514fc0470e38 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -374,6 +374,12 @@ static struct hist_entry *add_hist_entry(struct hists *hists, if (!cmp) { he_stat__add_period(&he->stat, period, weight); + /* + * This mem info was allocated from machine__resolve_mem + * and will not be used anymore. + */ + free(entry->mem_info); + /* If the map of an existing hist_entry has * become out-of-date due to an exec() or * similar, update it. Otherwise we will |