perf top: Use perf_evlist__config()
Commit-ID: 2376c67a7bbc7849b806688ba2efb8520c21c458 Gitweb: http://git.kernel.org/tip/2376c67a7bbc7849b806688ba2efb8520c21c458 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 11 Dec 2012 16:48:41 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Dec 2012 17:22:39 -0300
perf top: Use perf_evlist__config()
Using struct perf_record_opts to specify how to configure the evsel perf_event_attrs.
This gets top closer to record in the way it sets up evsels, with the aim of sharing more and more to the point that both will be a single utility.
In this direction top now uses the same callchain option parsing as record and that brings DWARF callchains to top, something that was already available for record.
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/Documentation/perf-top.txt | 2 +- tools/perf/builtin-top.c | 204 +++++++++++----------------------- tools/perf/util/top.c | 22 ++-- tools/perf/util/top.h | 8 +- 4 files changed, 79 insertions(+), 157 deletions(-)
tools/perf/Documentation/perf-top.txt +1 -1
@@ -60,7 +60,7 @@ Default is to monitor all CPUS. -i:: --inherit:: - Child tasks inherit counters, only makes sens with -p option. + Child tasks do not inherit counters. -k <path>:: --vmlinux=<path>::
tools/perf/builtin-top.c +65 -139
339 lines not on this page · raw message
tools/perf/util/top.c +12 -10
@@ -26,6 +26,8 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)float samples_per_sec = top->samples / top->delay_secs;float ksamples_per_sec = top->kernel_samples / top->delay_secs;float esamples_percent = (100.0 * top->exact_samples) / top->samples; +struct perf_record_opts *opts = &top->record_opts; +struct perf_target *target = &opts->target;size_t ret =0 ;if (!perf_guest) {
@@ -61,31 +63,31 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)struct perf_evsel *first =perf_evlist__first (top->evlist); ret +=SNPRINTF (bf + ret, size - ret,"%" PRIu64"%s " , (uint64_t )first->attr.sample_period, - top->freq ?"Hz" :"" ); + opts->freq ?"Hz" :"" ); } ret +=SNPRINTF (bf + ret, size - ret,"%s" ,perf_evsel__name (top->sym_evsel)); ret +=SNPRINTF (bf + ret, size - ret,"], " ); -if (top->target.pid) +if (target->pid) ret +=SNPRINTF (bf + ret, size - ret," (target_pid: %s" , - top->target.pid); -else if (top->target.tid) + target->pid); +else if (target->tid) ret +=SNPRINTF (bf + ret, size - ret," (target_tid: %s" , - top->target.tid); -else if (top->target.uid_str !=NULL ) + target->tid); +else if (target->uid_str !=NULL ) ret +=SNPRINTF (bf + ret, size - ret," (uid: %s" , - top->target.uid_str); + target->uid_str);else ret +=SNPRINTF (bf + ret, size - ret," (all" ); -if (top->target.cpu_list) +if (target->cpu_list) ret +=SNPRINTF (bf + ret, size - ret,", CPU%s: %s)" , top->evlist->cpus->nr >1 ?"s" :"" , - top->target.cpu_list); + target->cpu_list);else { -if (top->target.tid) +if (target->tid) ret +=SNPRINTF (bf + ret, size - ret,")" );else ret += SNPRINTF(bf + ret, size - ret, ", %d CPU%s)",
tools/perf/util/top.h +1 -7
@@ -14,7 +14,7 @@ struct perf_session;struct perf_top {struct perf_tool tool;struct perf_evlist *evlist; -struct perf_target target; +struct perf_record_opts record_opts;/* * Symbols will be added here in perf_event__process_sample and will * get out after decayed.
@@ -24,15 +24,11 @@ struct perf_top {u64 exact_samples;u64 guest_us_samples, guest_kernel_samples;int print_entries, count_filter, delay_secs; -int freq;bool hide_kernel_symbols, hide_user_symbols, zero;bool use_tui, use_stdio;bool sort_has_symbols; -bool dont_use_callchains;bool kptr_restrict_warned;bool vmlinux_warned; -bool inherit; -bool group;bool sample_id_all_missing;bool exclude_guest_missing;bool dump_symtab;
@@ -40,8 +36,6 @@ struct perf_top {struct perf_evsel *sym_evsel;struct perf_session *session;struct winsize winsize; -unsigned int mmap_pages; -int default_interval;int realtime_prio;int sym_pcnt_filter;const char *sym_filter;