perf evlist: Introduce perf_evlist__add_attrs
Commit-ID: 50d08e47bc04eb05502f5c86b70bbd19ef1c2778 Gitweb: http://git.kernel.org/tip/50d08e47bc04eb05502f5c86b70bbd19ef1c2778 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 4 Nov 2011 09:10:59 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 28 Nov 2011 10:24:43 -0200
perf evlist: Introduce perf_evlist__add_attrs
Replacing the open coded equivalents in 'perf stat'.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-stat.c | 40 +++++++--------------------------------- tools/perf/util/evlist.c | 34 ++++++++++++++++++++++++++++++++++ tools/perf/util/evlist.h | 7 +++++++ 3 files changed, 48 insertions(+), 33 deletions(-)
tools/perf/builtin-stat.c +7 -33
@@ -1107,22 +1107,13 @@ static const struct option options[] = {*/ static int add_default_attributes (void ) { -struct perf_evsel *pos; -size_t attr_nr =0 ; -size_t c; -/* Set attrs if no event is selected and !null_run: */ if (null_run)return 0 ;if (!evsel_list->nr_entries) { -for (c =0 ; c <ARRAY_SIZE (default_attrs); c++) { - pos =perf_evsel__new (default_attrs + c, c + attr_nr); -if (pos ==NULL ) -return -1 ; -perf_evlist__add (evsel_list, pos); - } - attr_nr += c; +if (perf_evlist__add_attrs_array (evsel_list, default_attrs) <0 ) +return -1 ; }/* Detailed events get appended to the event list: */
@@ -1131,38 +1122,21 @@ static int add_default_attributes(void)return 0 ;/* Append detailed run extra attributes: */ -for (c =0 ; c <ARRAY_SIZE (detailed_attrs); c++) { - pos =perf_evsel__new (detailed_attrs + c, c + attr_nr); -if (pos ==NULL ) -return -1 ; -perf_evlist__add (evsel_list, pos); - } - attr_nr += c; +if (perf_evlist__add_attrs_array (evsel_list, detailed_attrs) <0 ) +return -1 ;if (detailed_run <2 )return 0 ;/* Append very detailed run extra attributes: */ -for (c =0 ; c <ARRAY_SIZE (very_detailed_attrs); c++) { - pos =perf_evsel__new (very_detailed_attrs + c, c + attr_nr); -if (pos ==NULL ) -return -1 ; -perf_evlist__add (evsel_list, pos); - } +if (perf_evlist__add_attrs_array (evsel_list, very_detailed_attrs) <0 ) +return -1 ;if (detailed_run <3 )return 0 ;/* Append very, very detailed run extra attributes: */ -for (c =0 ; c <ARRAY_SIZE (very_very_detailed_attrs); c++) { - pos =perf_evsel__new (very_very_detailed_attrs + c, c + attr_nr); -if (pos ==NULL ) -return -1 ; -perf_evlist__add (evsel_list, pos); - } - - -return 0 ; +return perf_evlist__add_attrs_array (evsel_list, very_very_detailed_attrs); }int cmd_stat (int argc,const char **argv,const char *prefix__used )
tools/perf/util/evlist.c +34 -0
@@ -13,6 +13,8 @@#include "evsel.h" #include "util.h" +#include "parse-events.h" +#include <sys/mman.h> #include <linux/bitops.h>
@@ -76,6 +78,14 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry) ++evlist->nr_entries; } +static void perf_evlist__splice_list_tail (struct perf_evlist *evlist, +struct list_head *list, +int nr_entries) +{ +list_splice_tail (list, &evlist->entries); + evlist->nr_entries += nr_entries; +} +int perf_evlist__add_default (struct perf_evlist *evlist) {struct perf_event_attr attr = {
@@ -100,6 +110,30 @@ error:return -ENOMEM ; } +int perf_evlist__add_attrs (struct perf_evlist *evlist, +struct perf_event_attr *attrs,size_t nr_attrs) +{ +struct perf_evsel *evsel, *n; +LIST_HEAD (head); +size_t i; + +for (i =0 ; i < nr_attrs; i++) { + evsel =perf_evsel__new (attrs + i, evlist->nr_entries + i); +if (evsel ==NULL ) + goto out_delete_partial_list; +list_add_tail (&evsel->node, &head); + } + +perf_evlist__splice_list_tail (evlist, &head, nr_attrs); + +return 0 ; + +out_delete_partial_list: +list_for_each_entry_safe (evsel, n, &head, node) +perf_evsel__delete (evsel); +return -1 ; +} +void perf_evlist__disable (struct perf_evlist *evlist) {int cpu, thread;
tools/perf/util/evlist.h +7 -0
@@ -2,8 +2,10 @@#define __PERF_EVLIST_H 1#include <linux/list.h> +#include <stdio.h> #include "../perf.h" #include "event.h" +#include "util.h" struct pollfd ;struct thread_map ;
@@ -39,6 +41,11 @@ void perf_evlist__delete(struct perf_evlist *evlist);void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *entry);int perf_evlist__add_default (struct perf_evlist *evlist); +int perf_evlist__add_attrs (struct perf_evlist *evlist, +struct perf_event_attr *attrs,size_t nr_attrs); + +#define perf_evlist__add_attrs_array (evlist, array) \ + perf_evlist__add_attrs(evlist, array, ARRAY_SIZE(array))void perf_evlist__id_add (struct perf_evlist *evlist,struct perf_evsel *evsel,int cpu,int thread,u64 id);