perf evsel: Fix memory leaks on evsel->counts
Namhyung Kim
maintainerPATCH 1/1 perf evsel: Fix memory leaks on evsel->counts
From: Namhyung Kim <[email protected]>
The ->counts field was never freed in the current code. Add perf_evsel__free_counts() function to free it properly.
---
This patch is based on Stephane's interval printing patchset v6.
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(+)
tools/perf/builtin-stat.c +1 -0
@@ -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);
tools/perf/tests/open-syscall-all-cpus.c +1 -0
@@ -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:
tools/perf/util/evsel.c +5 -0
@@ -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));
tools/perf/util/evsel.h +1 -0
@@ -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,
Signature · 1 line
1.7.11.7
Em Fri, Jan 25, 2013 at 10:44:44AM +0900, Namhyung Kim escreveu:
Quoted 4 lines
From: Namhyung Kim <[email protected]>
The ->counts field was never freed in the current code. Add
perf_evsel__free_counts()function to free it properly.
I still haven't applied Stephane's patches, that his one depends on, will do it tomorrow.
- Arnaldo
Em Thu, Jan 24, 2013 at 11:45:58PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 8 lines
Em Fri, Jan 25, 2013 at 10:44:44AM +0900, Namhyung Kim escreveu:
Quoted 4 lines
From: Namhyung Kim <[email protected]>
The ->counts field was never freed in the current code. Add
perf_evsel__free_counts()function to free it properly.I still haven't applied Stephane's patches, that his one depends on, will do it tomorrow.
Done, applied, thanks!
- Arnaldo
Commit-ID: 43f8e76e6b96eb1327cff62ac1cc733a51f31068 Gitweb: http://git.kernel.org/tip/43f8e76e6b96eb1327cff62ac1cc733a51f31068 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 25 Jan 2013 10:44:44 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 30 Jan 2013 10:37:04 -0300
perf evsel: Fix memory leaks on evsel->counts
The ->counts field was never freed in the current code. Add perf_evsel__free_counts() function to free it properly.
--- 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(+)
tools/perf/builtin-stat.c +1 -0
@@ -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);
tools/perf/tests/open-syscall-all-cpus.c +1 -0
@@ -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:
tools/perf/util/evsel.c +5 -0
@@ -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));
tools/perf/util/evsel.h +1 -0
@@ -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,