perf evsel: Adopt fprintf routine from ' perf evlist'
Commit-ID: 0698aeddcfe0c2514af1d012082665a3bb55d01b Gitweb: http://git.kernel.org/tip/0698aeddcfe0c2514af1d012082665a3bb55d01b Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 10 Dec 2012 18:17:08 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Dec 2012 17:19:53 -0300
perf evsel: Adopt fprintf routine from 'perf evlist'
So that we can print all the details when debugging other tools, when we have just evlists and evsels, not a perf.data file.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[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-evlist.c | 81 ++------------------------------------------- tools/perf/util/evsel.c | 77 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/evsel.h | 8 +++++ 3 files changed, 87 insertions(+), 79 deletions(-)
tools/perf/builtin-evlist.c +2 -79
@@ -15,39 +15,6 @@#include "util/parse-options.h" #include "util/session.h" -struct perf_attr_details { -bool freq; -bool verbose; -}; - -static int comma_printf (bool *first,const char *fmt, ...) -{ -va_list args; -int ret =0 ; - -if (!*first) { - ret +=printf ("," ); - }else { - ret +=printf (":" ); - *first = false; - } - -va_start (args, fmt); - ret +=vprintf (fmt, args); -va_end (args); -return ret; -} - -static int __if_print (bool *first,const char *field,u64 value) -{ -if (value ==0 ) -return 0 ; - -return comma_printf (first," %s: %" PRIu64, field, value); -} - -#define if_print (field) __if_print(&first, #field, pos->attr.field) -static int __cmd_evlist (const char *file_name,struct perf_attr_details *details) {struct perf_session *session;
@@ -57,52 +24,8 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsif (session ==NULL )return -ENOMEM ; -list_for_each_entry (pos, &session->evlist->entries, node) { -bool first = true; - -printf ("%s" ,perf_evsel__name (pos)); - -if (details->verbose || details->freq) { -comma_printf (&first," sample_freq=%" PRIu64, - (u64 )pos->attr.sample_freq); - } - -if (details->verbose) { -if_print (type); -if_print (config); -if_print (config1); -if_print (config2); -if_print (size); -if_print (sample_type); -if_print (read_format); -if_print (disabled); -if_print (inherit); -if_print (pinned); -if_print (exclusive); -if_print (exclude_user); -if_print (exclude_kernel); -if_print (exclude_hv); -if_print (exclude_idle); -if_print (mmap); -if_print (comm); -if_print (freq); -if_print (inherit_stat); -if_print (enable_on_exec); -if_print (task); -if_print (watermark); -if_print (precise_ip); -if_print (mmap_data); -if_print (sample_id_all); -if_print (exclude_host); -if_print (exclude_guest); -if_print (__reserved_1); -if_print (wakeup_events); -if_print (bp_type); -if_print (branch_sample_type); - } - -putchar ('\n' ); - } +list_for_each_entry (pos, &session->evlist->entries, node) +perf_evsel__fprintf (pos, details, stdout);perf_session__delete (session);return 0 ;
tools/perf/util/evsel.c +77 -0
80 lines not on this page · raw message
tools/perf/util/evsel.h +8 -0
@@ -243,4 +243,12 @@ static inline bool perf_evsel__is_group_leader(const struct perf_evsel *evsel) {return evsel->leader == evsel; } + +struct perf_attr_details { +bool freq; +bool verbose; +}; + +int perf_evsel__fprintf (struct perf_evsel *evsel, +struct perf_attr_details *details,FILE *fp);#endif /* __PERF_EVSEL_H */