perf evlist: Introduce perf_evlist__close()
Namhyung Kim
maintainerPATCH 1/6 perf evlist: Introduce perf_evlist__close()
From: Namhyung Kim <[email protected]>
It's a pair of perf_evlist__open().
--- tools/perf/util/evlist.c | 19 ++++++++++++------- tools/perf/util/evlist.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-)
tools/perf/util/evlist.c +12 -7
@@ -721,10 +721,20 @@ void perf_evlist__set_selected(struct perf_evlist *evlist, evlist->selected = evsel; } +void perf_evlist__close (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; +int ncpus =cpu_map__nr (evlist->cpus); +int nthreads =thread_map__nr (evlist->threads); + +list_for_each_entry_reverse (evsel, &evlist->entries, node) +perf_evsel__close (evsel, ncpus, nthreads); +} +int perf_evlist__open (struct perf_evlist *evlist) {struct perf_evsel *evsel; -int err, ncpus, nthreads; +int err;list_for_each_entry (evsel, &evlist->entries, node) { err =perf_evsel__open (evsel, evlist->cpus, evlist->threads);
@@ -734,12 +744,7 @@ int perf_evlist__open(struct perf_evlist *evlist)return 0 ; out_err: - ncpus =cpu_map__nr (evlist->cpus); - nthreads =thread_map__nr (evlist->threads); - -list_for_each_entry_reverse (evsel, &evlist->entries, node) -perf_evsel__close (evsel, ncpus, nthreads); - +perf_evlist__close (evlist); errno = -err;return err; }
tools/perf/util/evlist.h +1 -0
@@ -81,6 +81,7 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id);union perf_event *perf_evlist__mmap_read (struct perf_evlist *self,int idx);int perf_evlist__open (struct perf_evlist *evlist); +void perf_evlist__close (struct perf_evlist *evlist);void perf_evlist__config (struct perf_evlist *evlist,struct perf_record_opts *opts);
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 2/6 perf evsel: Cleanup perf_evsel__exit()
From: Namhyung Kim <[email protected]>
Use perf_evsel__free_* because they do the same thing and ensures the pointer has NULL value at the end.
--- tools/perf/util/evsel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/evsel.c +2 -3
@@ -673,9 +673,8 @@ void perf_evsel__free_counts(struct perf_evsel *evsel)void perf_evsel__exit (struct perf_evsel *evsel) {assert (list_empty (&evsel->node)); -xyarray__delete (evsel->fd); -xyarray__delete (evsel->sample_id); -free (evsel->id); +perf_evsel__free_fd (evsel); +perf_evsel__free_id (evsel); }void perf_evsel__delete (struct perf_evsel *evsel)
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf evsel: Cleanup perf_evsel__exit()
perf evsel: Cleanup perf_evsel__exit()
Commit-ID: 736b05a0462aff65140865bacd5e04d1813e73e1 Gitweb: http://git.kernel.org/tip/736b05a0462aff65140865bacd5e04d1813e73e1 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 15 Mar 2013 14:48:49 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:10 -0300
perf evsel: Cleanup perf_evsel__exit()
Use perf_evsel__free_* because they do the same thing and ensures the pointer has NULL value at the end.
--- tools/perf/util/evsel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/evsel.c +2 -3
@@ -673,9 +673,8 @@ void perf_evsel__free_counts(struct perf_evsel *evsel)void perf_evsel__exit (struct perf_evsel *evsel) {assert (list_empty (&evsel->node)); -xyarray__delete (evsel->fd); -xyarray__delete (evsel->sample_id); -free (evsel->id); +perf_evsel__free_fd (evsel); +perf_evsel__free_id (evsel); }void perf_evsel__delete (struct perf_evsel *evsel)
Namhyung Kim
maintainerPATCH 3/6 perf trace: Free evlist resources properly on return path
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The trace_run() function calls several evlist functions but misses some pair-wise cleanup routines on return path. Fix it.
--- tools/perf/builtin-trace.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
tools/perf/builtin-trace.c +11 -5
@@ -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:
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf trace: Free evlist resources properly on return path
perf trace: Free evlist resources properly on return path
Commit-ID: 3beb0861438f63bc2025f8afba213dc3d0458bc5 Gitweb: http://git.kernel.org/tip/3beb0861438f63bc2025f8afba213dc3d0458bc5 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 15 Mar 2013 14:48:50 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:11 -0300
perf trace: Free evlist resources properly on return path
The trace_run() function calls several evlist functions but misses some pair-wise cleanup routines on return path. Fix it.
--- tools/perf/builtin-trace.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
tools/perf/builtin-trace.c +11 -5
@@ -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:
Namhyung Kim
maintainerPATCH 4/6 perf record: Fixup return path of cmd_record()
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The error path of calling perf_target__parse_uid wrongly went to out_free_fd. Also add missing evlist cleanup routines.
--- tools/perf/builtin-record.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/builtin-record.c +4 -1
@@ -1028,7 +1028,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)ui__error ("%s" , errbuf); err = -saved_errno; - goto out_free_fd; + goto out_symbol_exit; } err = -ENOMEM ;
@@ -1059,6 +1059,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) } err =__cmd_record (&record, argc, argv); + +perf_evlist__munmap (evsel_list); +perf_evlist__close (evsel_list); out_free_fd:perf_evlist__delete_maps (evsel_list); out_symbol_exit:
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf record: Fixup return path of cmd_record()
perf record: Fixup return path of cmd_record()
Commit-ID: 8fa60e1fbaecd2e652abe41f68a934c1759663f3 Gitweb: http://git.kernel.org/tip/8fa60e1fbaecd2e652abe41f68a934c1759663f3 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 15 Mar 2013 14:48:51 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:11 -0300
perf record: Fixup return path of cmd_record()
The error path of calling perf_target__parse_uid wrongly went to out_free_fd. Also add missing evlist cleanup routines.
--- tools/perf/builtin-record.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/builtin-record.c +4 -1
@@ -1028,7 +1028,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)ui__error ("%s" , errbuf); err = -saved_errno; - goto out_free_fd; + goto out_symbol_exit; } err = -ENOMEM ;
@@ -1059,6 +1059,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) } err =__cmd_record (&record, argc, argv); + +perf_evlist__munmap (evsel_list); +perf_evlist__close (evsel_list); out_free_fd:perf_evlist__delete_maps (evsel_list); out_symbol_exit:
Namhyung Kim
maintainerPATCH 5/6 perf test: Fixup return path of open-syscall-tp-fields test case
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Add missing evlist cleanup functions.
--- tools/perf/tests/open-syscall-tp-fields.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/tests/open-syscall-tp-fields.c +6 -2
@@ -48,13 +48,13 @@ int test__syscall_open_tp_fields(void) err =perf_evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_delete_maps; } err =perf_evlist__mmap (evlist,UINT_MAX , false);if (err <0 ) {pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_close_evlist; }perf_evlist__enable (evlist);
@@ -110,6 +110,10 @@ out_ok: err =0 ; out_munmap: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:
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tests: Fixup return path of open-syscall-tp-fields test case
perf tests: Fixup return path of open-syscall-tp-fields test case
Commit-ID: 9b5b7cdc5139fdcc30ee56d9cd162da60453f6d8 Gitweb: http://git.kernel.org/tip/9b5b7cdc5139fdcc30ee56d9cd162da60453f6d8 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 15 Mar 2013 14:48:52 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:12 -0300
perf tests: Fixup return path of open-syscall-tp-fields test case
Add missing evlist cleanup functions.
--- tools/perf/tests/open-syscall-tp-fields.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/tests/open-syscall-tp-fields.c +6 -2
@@ -48,13 +48,13 @@ int test__syscall_open_tp_fields(void) err =perf_evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_delete_maps; } err =perf_evlist__mmap (evlist,UINT_MAX , false);if (err <0 ) {pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_close_evlist; }perf_evlist__enable (evlist);
@@ -110,6 +110,10 @@ out_ok: err =0 ; out_munmap: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:
Namhyung Kim
maintainerPATCH 6/6 perf test: Fixup return path of perf record test case
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Add missing perf_evlist__close() function.
--- tools/perf/tests/perf-record.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/tests/perf-record.c +3 -1
@@ -143,7 +143,7 @@ int test__PERF_RECORD(void) err =perf_evlist__mmap (evlist, opts.mmap_pages, false);if (err <0 ) {pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); - goto out_delete_maps; + goto out_close_evlist; }/*
@@ -306,6 +306,8 @@ found_exit: } out_err:perf_evlist__munmap (evlist); +out_close_evlist: +perf_evlist__close (evlist); out_delete_maps:perf_evlist__delete_maps (evlist); out_delete_evlist:
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tests: Fixup return path of perf record test case
perf tests: Fixup return path of perf record test case
Commit-ID: da522c17035a8415232d850b539ea60063fc7ecc Gitweb: http://git.kernel.org/tip/da522c17035a8415232d850b539ea60063fc7ecc Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 15 Mar 2013 14:48:53 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:12 -0300
perf tests: Fixup return path of perf record test case
Add missing perf_evlist__close() function.
--- tools/perf/tests/perf-record.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/tests/perf-record.c +3 -1
@@ -143,7 +143,7 @@ int test__PERF_RECORD(void) err =perf_evlist__mmap (evlist, opts.mmap_pages, false);if (err <0 ) {pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); - goto out_delete_maps; + goto out_close_evlist; }/*
@@ -306,6 +306,8 @@ found_exit: } out_err:perf_evlist__munmap (evlist); +out_close_evlist: +perf_evlist__close (evlist); out_delete_maps:perf_evlist__delete_maps (evlist); out_delete_evlist:
tip-bot for Namhyung Kim
merge botperf evlist: Introduce perf_evlist__close()
Commit-ID: a74b4b66cc027110272a18cd50cc6ee93483e78d Gitweb: http://git.kernel.org/tip/a74b4b66cc027110272a18cd50cc6ee93483e78d Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 15 Mar 2013 14:48:48 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:10 -0300
perf evlist: Introduce perf_evlist__close()
It's a pair of perf_evlist__open().
--- tools/perf/util/evlist.c | 19 ++++++++++++------- tools/perf/util/evlist.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-)
tools/perf/util/evlist.c +12 -7
@@ -721,10 +721,20 @@ void perf_evlist__set_selected(struct perf_evlist *evlist, evlist->selected = evsel; } +void perf_evlist__close (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; +int ncpus =cpu_map__nr (evlist->cpus); +int nthreads =thread_map__nr (evlist->threads); + +list_for_each_entry_reverse (evsel, &evlist->entries, node) +perf_evsel__close (evsel, ncpus, nthreads); +} +int perf_evlist__open (struct perf_evlist *evlist) {struct perf_evsel *evsel; -int err, ncpus, nthreads; +int err;list_for_each_entry (evsel, &evlist->entries, node) { err =perf_evsel__open (evsel, evlist->cpus, evlist->threads);
@@ -734,12 +744,7 @@ int perf_evlist__open(struct perf_evlist *evlist)return 0 ; out_err: - ncpus =cpu_map__nr (evlist->cpus); - nthreads =thread_map__nr (evlist->threads); - -list_for_each_entry_reverse (evsel, &evlist->entries, node) -perf_evsel__close (evsel, ncpus, nthreads); - +perf_evlist__close (evlist); errno = -err;return err; }
tools/perf/util/evlist.h +1 -0
@@ -81,6 +81,7 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id);union perf_event *perf_evlist__mmap_read (struct perf_evlist *self,int idx);int perf_evlist__open (struct perf_evlist *evlist); +void perf_evlist__close (struct perf_evlist *evlist);void perf_evlist__config (struct perf_evlist *evlist,struct perf_record_opts *opts);