From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 15/21] perf evsel: Fix memory leaks on evsel->counts
Date: Wed, 30 Jan 2013 11:46:56 -0300 [thread overview]
Message-ID: <1359557222-17547-16-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1359557222-17547-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
The ->counts field was never freed in the current code. Add
perf_evsel__free_counts() function to free it properly.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
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/1359078284-32080-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-stat.c | 1 +
tools/perf/tests/open-syscall-all-cpus.c | 1 +
tools/perf/util/evsel.c | 5 +++++
tools/perf/util/evsel.h | 1 +
4 files changed, 8 insertions(+)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 493043a..0368a10 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1372,6 +1372,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
out_free_fd:
list_for_each_entry(pos, &evsel_list->entries, node) {
perf_evsel__free_stat_priv(pos);
+ perf_evsel__free_counts(pos);
perf_evsel__free_prev_raw_counts(pos);
}
perf_evlist__delete_maps(evsel_list);
diff --git a/tools/perf/tests/open-syscall-all-cpus.c b/tools/perf/tests/open-syscall-all-cpus.c
index 9b920a0..b0657a9 100644
--- a/tools/perf/tests/open-syscall-all-cpus.c
+++ b/tools/perf/tests/open-syscall-all-cpus.c
@@ -98,6 +98,7 @@ int test__open_syscall_event_on_all_cpus(void)
}
}
+ perf_evsel__free_counts(evsel);
out_close_fd:
perf_evsel__close_fd(evsel, 1, threads->nr);
out_evsel_delete:
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index dbdcca4..baa26dd 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -640,6 +640,11 @@ void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
}
}
+void perf_evsel__free_counts(struct perf_evsel *evsel)
+{
+ free(evsel->counts);
+}
+
void perf_evsel__exit(struct perf_evsel *evsel)
{
assert(list_empty(&evsel->node));
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 3a4cd60..cbf4232 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -117,6 +117,7 @@ int perf_evsel__alloc_id(struct perf_evsel *evsel, int ncpus, int nthreads);
int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus);
void perf_evsel__free_fd(struct perf_evsel *evsel);
void perf_evsel__free_id(struct perf_evsel *evsel);
+void perf_evsel__free_counts(struct perf_evsel *evsel);
void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads);
void __perf_evsel__set_sample_bit(struct perf_evsel *evsel,
--
1.8.1.1.361.gec3ae6e
next prev parent reply other threads:[~2013-01-30 14:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-30 14:46 [GIT PULL 00/21] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 01/21] tools lib traceevent: Handle dynamic array's element size properly Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 02/21] perf tools: Stop using 'self' in strlist Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 03/21] perf tools: Stop using 'self' in map.[ch] Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 04/21] perf tools: Use memdup in map__clone Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 05/21] perf kmem: Use memdup() Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 06/21] perf header: Stop using die() calls when processing tracing data Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 07/21] perf ui browser: Free browser->helpline() on ui_browser__hide() Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 08/21] perf tests: Call machine__exit in the vmlinux matches kallsyms test Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 09/21] perf tests: Fix leaks on PERF_RECORD_* test Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 10/21] tools: Correct typo in tools Makefile Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 11/21] perf: Add 'perf bench numa mem' NUMA performance measurement suite Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 12/21] perf tools: Make numa benchmark optional Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 13/21] perf evsel: Add prev_raw_count field Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 14/21] perf stat: Add interval printing Arnaldo Carvalho de Melo
2013-01-30 14:46 ` Arnaldo Carvalho de Melo [this message]
2013-01-30 14:46 ` [PATCH 16/21] perf tools, powerpc: Fix compile warnings in tests/attr.c Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 17/21] perf tools: Fix possible double free on error Arnaldo Carvalho de Melo
2013-01-30 14:46 ` [PATCH 18/21] perf sort: Use pclose() instead of fclose() on pipe stream Arnaldo Carvalho de Melo
2013-01-30 14:47 ` [PATCH 19/21] perf tools: Fix memory leak on error Arnaldo Carvalho de Melo
2013-01-30 14:47 ` [PATCH 20/21] perf header: Fix memory leak for the "Not caching a kptr_restrict'ed /proc/kallsyms" case Arnaldo Carvalho de Melo
2013-01-30 14:47 ` [PATCH 21/21] perf header: Fix double fclose() on do_write(fd, xxx) failure Arnaldo Carvalho de Melo
2013-01-31 9:27 ` [GIT PULL 00/21] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359557222-17547-16-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).