perf updates
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: d969135aae1434547f41853f0e8eaa622e8b8816 Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
A number of fixes:
* Fix segfault on perf trace -i perf.data, from Namhyung Kim.
* Fix segfault with --no-mmap-pages, from David Ahern.
* Don't force a refresh during progress update in the TUI, greatly reducing startup costs, fix from Patrick Palka.
* Fix sw clock event period test wrt not checking if using > max_sample_freq.
* Handle throttle events in 'object code reading' test, fix from Adrian Hunter.
* Prevent condition that all sort keys are elided, fix from Namhyung Kim.
* Round mmap pages to power 2, from David Ahern.
And a number of late arrival changes:
* Add summary only option to 'perf trace', suppressing the decoding of events, from David Ahern
* 'perf trace --summary' formatting simplifications, from Pekka Emberg.
* Beautify fifth argument of mmap() as fd, in 'perf trace', from Namhyung Kim.
* Add direct access to dynamic arrays in libtraceevent, from Steven Rostedt.
* Synthesize non-exec MMAP records when --data used, allowing the resolution of data addresses to symbols (global variables, etc), by Arnaldo Carvalho de Melo.
* Code cleanups by David Ahern and Adrian Hunter.
Thanks,
Ingo
------------------>
Adrian Hunter (3):
perf record: Use correct return type for write()
perf tests: Compensate lower sample freq with longer test loop perf tests: Handle throttle events in 'object code reading' test
Arnaldo Carvalho de Melo (7):
perf evsel: Remove idx parm from constructor
perf record: Synthesize non-exec MMAP records when --data used perf machine: Introduce synthesize_threads method out of open coded equivalent perf machine: Simplify synthesize_threads method
perf tests: Check return of perf_evlist__open sw clock event period test perf tests: Use lower sample_freq in sw clock event period test perf target: Shorten perf_target__ to target__
David Ahern (5):
perf record: Move existing write_output into helper function perf trace: Add summary only option
perf record: Fix segfault with --no-mmap-pages perf evlist: Round mmap pages to power 2 - v2 perf evlist: Refactor mmap_pages parsing
Namhyung Kim (4):
perf tools: Prevent condition that all sort keys are elided perf trace: Beautify fifth argument of mmap() as fd
perf trace: Separate tp syscall field caching into init routine to be reused perf trace: Fix segfault on perf trace -i perf.data
Patrick Palka (1):
perf ui tui progress: Don't force a refresh during progress update
Pekka Enberg (2):
perf trace: Change syscall summary duration order perf trace: Simplify '--summary' output
Steven Rostedt (1):
tools lib traceevent: Add direct access to dynamic arrays
tools/lib/traceevent/event-parse.c | 13 +++ tools/perf/Documentation/perf-trace.txt | 10 ++- tools/perf/builtin-kvm.c | 20 ++--- tools/perf/builtin-record.c | 35 ++++---- tools/perf/builtin-stat.c | 21 +++-- tools/perf/builtin-top.c | 24 ++--- tools/perf/builtin-trace.c | 143 +++++++++++++++++------------- tools/perf/perf.h | 2 +- tools/perf/tests/code-reading.c | 17 +++- tools/perf/tests/evsel-tp-sched.c | 4 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/open-syscall-all-cpus.c | 2 +- tools/perf/tests/open-syscall-tp-fields.c | 2 +- tools/perf/tests/open-syscall.c | 2 +- tools/perf/tests/sw-clock.c | 15 +++- tools/perf/tests/task-exit.c | 2 +- tools/perf/ui/tui/progress.c | 3 +- tools/perf/util/event.c | 50 ++++++----- tools/perf/util/event.h | 4 +- tools/perf/util/evlist.c | 73 ++++++++------- tools/perf/util/evlist.h | 5 +- tools/perf/util/evsel.c | 13 ++- tools/perf/util/evsel.h | 18 +++- tools/perf/util/header.c | 4 +- tools/perf/util/machine.c | 12 +++ tools/perf/util/machine.h | 12 +++ tools/perf/util/parse-events.c | 6 +- tools/perf/util/sort.c | 13 +++ tools/perf/util/target.c | 54 ++++++----- tools/perf/util/target.h | 44 +++++---- tools/perf/util/top.c | 2 +- 31 files changed, 363 insertions(+), 264 deletions(-)
tools/lib/traceevent/event-parse.c +13 -0
@@ -3435,6 +3435,19 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg goto out_warning_op; }break ; +case PRINT_DYNAMIC_ARRAY : +/* Without [], we pass the address to the dynamic data */ + offset =pevent_read_number (pevent, + data + arg->dynarray.field->offset, + arg->dynarray.field->size); +/* +* The actual length of the dynamic array is stored +* in the top half of the field, and the offset +* is in the bottom half of the 32 bit field. +*/ + offset &=0xffff ; + val = (unsigned long long )(data + offset); +break ;default :/* not sure what to do there */ return 0 ; }
tools/perf/Documentation/perf-trace.txt +8 -2
@@ -93,9 +93,15 @@ the thread executes on the designated CPUs. Default is to monitor all CPUs. --comm:: Show process COMM right beside its ID, on by default, disable with --no-comm. +-s:: --summary:: - Show a summary of syscalls by thread with min, max, and average times (in - msec) and relative stddev. + Show only a summary of syscalls by thread with min, max, and average times + (in msec) and relative stddev. + +-S:: +--with-summary:: + Show all syscalls followed by a summary by thread with min, max, and + average times (in msec) and relative stddev. --tool_stats:: Show tool stats such as number of times fd->pathname was discovered thru
tools/perf/builtin-kvm.c +5 -15
@@ -1510,13 +1510,13 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,/* * target related setups */ - err =perf_target__validate (&kvm->opts.target); + err =target__validate (&kvm->opts.target);if (err) { -perf_target__strerror (&kvm->opts.target, err, errbuf,BUFSIZ ); +target__strerror (&kvm->opts.target, err, errbuf,BUFSIZ );ui__warning ("%s" , errbuf); } -if (perf_target__none (&kvm->opts.target)) +if (target__none (&kvm->opts.target)) kvm->opts.target.system_wide = true;
@@ -1544,18 +1544,8 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, } kvm->session->evlist = kvm->evlist;perf_session__set_id_hdr_size (kvm->session); - - -if (perf_target__has_task (&kvm->opts.target)) -perf_event__synthesize_thread_map (&kvm->tool, - kvm->evlist->threads, - perf_event__process, - &kvm->session->machines.host); -else -perf_event__synthesize_threads (&kvm->tool, perf_event__process, - &kvm->session->machines.host); - - +machine__synthesize_threads (&kvm->session->machines.host, &kvm->opts.target, + kvm->evlist->threads, false); err =kvm_live_open_events (kvm);if (err) goto out;
tools/perf/builtin-record.c +16 -19
@@ -76,12 +76,12 @@ struct perf_record {long samples; }; -static int write_output (struct perf_record *rec,void *buf,size_t size) +static int do_write_output (struct perf_record *rec,void *buf,size_t size) {struct perf_data_file *file = &rec->file;while (size) { -int ret =write (file->fd, buf, size); +ssize_t ret =write (file->fd, buf, size);if (ret <0 ) {pr_err ("failed to write perf data, error: %m\n" );
@@ -97,6 +97,11 @@ static int write_output(struct perf_record *rec, void *buf, size_t size)return 0 ; } +static int write_output (struct perf_record *rec,void *buf,size_t size) +{ +return do_write_output (rec, buf, size); +} + static int process_synthesized_event(struct perf_tool *tool, union perf_event *event, struct perf_sample *sample __maybe_unused,
@@ -480,16 +485,8 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) perf_event__synthesize_guest_os, tool); } -if (perf_target__has_task (&opts->target)) - err =perf_event__synthesize_thread_map (tool, evsel_list->threads, - process_synthesized_event, - machine); -else if (perf_target__has_cpu (&opts->target)) - err =perf_event__synthesize_threads (tool, process_synthesized_event, - machine); -else /* command specified */ - err =0 ; - + err =__machine__synthesize_threads (machine, tool, &opts->target, evsel_list->threads, + process_synthesized_event, opts->sample_address);if (err !=0 ) goto out_delete_session;
@@ -509,7 +506,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)* (apart from group members) have enable_on_exec=1 set, * so don't spoil it by prematurely enabling them. */ -if (!perf_target__none (&opts->target)) +if (!target__none (&opts->target))perf_evlist__enable (evsel_list);/*
@@ -538,7 +535,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)* die with the process and we wait for that. Thus no need to * disable events in this case. */ -if (done && !disabled && !perf_target__none (&opts->target)) { +if (done && !disabled && !target__none (&opts->target)) {perf_evlist__disable (evsel_list); disabled = true; }
@@ -909,7 +906,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); -if (!argc &&perf_target__none (&rec->opts.target)) +if (!argc &&target__none (&rec->opts.target))usage_with_options (record_usage, record_options);if (nr_cgroups && !rec->opts.target.system_wide) {
@@ -939,17 +936,17 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } - err =perf_target__validate (&rec->opts.target); + err =target__validate (&rec->opts.target);if (err) { -perf_target__strerror (&rec->opts.target, err, errbuf,BUFSIZ ); +target__strerror (&rec->opts.target, err, errbuf,BUFSIZ );ui__warning ("%s" , errbuf); } - err =perf_target__parse_uid (&rec->opts.target); + err =target__parse_uid (&rec->opts.target);if (err) {int saved_errno = errno; -perf_target__strerror (&rec->opts.target, err, errbuf,BUFSIZ ); +target__strerror (&rec->opts.target, err, errbuf,BUFSIZ );ui__error ("%s" , errbuf); err = -saved_errno;
tools/perf/builtin-stat.c +10 -11
@@ -108,7 +108,7 @@ enum {static struct perf_evlist *evsel_list; -static struct perf_target target = { +static struct target target = { .uid =UINT_MAX , };
@@ -294,11 +294,10 @@ static int create_perf_stat_counter(struct perf_evsel *evsel) attr->inherit = !no_inherit; -if (perf_target__has_cpu (&target)) +if (target__has_cpu (&target))return perf_evsel__open_per_cpu (evsel,perf_evsel__cpus (evsel)); -if (!perf_target__has_task (&target) && -perf_evsel__is_group_leader (evsel)) { +if (!target__has_task (&target) &&perf_evsel__is_group_leader (evsel)) { attr->disabled =1 ;if (!initial_delay) attr->enable_on_exec =1 ;
@@ -1236,7 +1235,7 @@ static void print_stat(int argc, const char **argv)fprintf (output,"\'system wide" ); else if (target.cpu_list) fprintf(output, "\'CPU(s) %s", target.cpu_list); - else if (!perf_target__has_task(&target)) { + else if (!target__has_task(&target)) { fprintf(output, "\'%s", argv[0]); for (i = 1; i < argc; i++) fprintf(output, " %s", argv[i]);
@@ -1667,7 +1666,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) }else if (big_num_opt ==0 )/* User passed --no-big-num */ big_num = false; -if (!argc &&perf_target__none (&target)) +if (!argc &&target__none (&target))usage_with_options (stat_usage, options);if (run_count <0 ) {
@@ -1680,8 +1679,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) }/* no_aggr, cgroup are for system-wide only */ -if ((aggr_mode !=AGGR_GLOBAL || nr_cgroups) - && !perf_target__has_cpu (&target)) { +if ((aggr_mode !=AGGR_GLOBAL || nr_cgroups) && + !target__has_cpu (&target)) {fprintf (stderr,"both cgroup and no-aggregation " "modes only available in system-wide mode\n" );
@@ -1694,14 +1693,14 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)if (add_default_attributes ()) goto out; -perf_target__validate (&target); +target__validate (&target);if (perf_evlist__create_maps (evsel_list, &target) <0 ) { -if (perf_target__has_task (&target)) { +if (target__has_task (&target)) {pr_err ("Problems finding threads of monitor\n" );parse_options_usage (stat_usage, options,"p" ,1 );parse_options_usage (NULL , options,"t" ,1 ); - }else if (perf_target__has_cpu (&target)) { + }else if (target__has_cpu (&target)) {perror ("failed to parse CPUs map" );parse_options_usage (stat_usage, options,"C" ,1 );parse_options_usage (NULL , options,"a" ,1 );
tools/perf/builtin-top.c +9 -15
@@ -950,14 +950,8 @@ static int __cmd_top(struct perf_top *top)if (ret) goto out_delete; -if (perf_target__has_task (&opts->target)) -perf_event__synthesize_thread_map (&top->tool, top->evlist->threads, - perf_event__process, - &top->session->machines.host); -else -perf_event__synthesize_threads (&top->tool, perf_event__process, - &top->session->machines.host); - +machine__synthesize_threads (&top->session->machines.host, &opts->target, + top->evlist->threads, false); ret =perf_top__start_counters (top);if (ret) goto out_delete;
@@ -973,7 +967,7 @@ static int __cmd_top(struct perf_top *top)* XXX 'top' still doesn't start workloads like record, trace, but should, * so leave the check here. */ -if (!perf_target__none (&opts->target)) +if (!target__none (&opts->target))perf_evlist__enable (top->evlist);/* Wait for a minimal set of events before starting the snapshot */
@@ -1059,7 +1053,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) .sym_pcnt_filter = 5, };struct perf_record_opts *opts = &top.record_opts; -struct perf_target *target = &opts->target; +struct target *target = &opts->target;const struct option options[] = { OPT_CALLBACK('e', "event", &top.evlist, "event", "event selector. use 'perf list' to list available events",
@@ -1175,24 +1169,24 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)setup_browser (false); - status =perf_target__validate (target); + status =target__validate (target);if (status) { -perf_target__strerror (target, status, errbuf,BUFSIZ ); +target__strerror (target, status, errbuf,BUFSIZ );ui__warning ("%s" , errbuf); } - status =perf_target__parse_uid (target); + status =target__parse_uid (target);if (status) {int saved_errno = errno; -perf_target__strerror (target, status, errbuf,BUFSIZ ); +target__strerror (target, status, errbuf,BUFSIZ );ui__error ("%s" , errbuf); status = -saved_errno; goto out_delete_evlist; } -if (perf_target__none (target)) +if (target__none (target)) target->system_wide = true;if (perf_evlist__create_maps (top.evlist, target) <0 )
tools/perf/builtin-trace.c +80 -63
283 lines not on this page · raw message
tools/perf/perf.h +1 -1
@@ -248,7 +248,7 @@ enum perf_call_graph_mode { };struct perf_record_opts { -struct perf_target target; +struct target target;int call_graph;bool group;bool inherit_stat;
tools/perf/tests/code-reading.c +14 -3
@@ -275,8 +275,19 @@ static int process_event(struct machine *machine, struct perf_evlist *evlist,if (event->header.type ==PERF_RECORD_SAMPLE )return process_sample_event (machine, evlist, event, state); -if (event->header.type <PERF_RECORD_MAX ) -return machine__process_event (machine, event,NULL ); +if (event->header.type ==PERF_RECORD_THROTTLE || + event->header.type ==PERF_RECORD_UNTHROTTLE ) +return 0 ; + +if (event->header.type <PERF_RECORD_MAX ) { +int ret; + + ret =machine__process_event (machine, event,NULL ); +if (ret <0 ) +pr_debug ("machine__process_event failed, event type %u\n" , + event->header.type); +return ret; + }return 0 ; }
@@ -441,7 +452,7 @@ static int do_test_code_reading(bool try_kcore) } ret =perf_event__synthesize_thread_map (NULL , threads, - perf_event__process, machine); + perf_event__process, machine, false);if (ret <0 ) {pr_debug ("perf_event__synthesize_thread_map failed\n" ); goto out_err;
tools/perf/tests/evsel-tp-sched.c +2 -2
@@ -32,7 +32,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,int test__perf_evsel__tp_sched_test (void ) { -struct perf_evsel *evsel =perf_evsel__newtp ("sched" ,"sched_switch" ,0 ); +struct perf_evsel *evsel =perf_evsel__newtp ("sched" ,"sched_switch" );int ret =0 ;if (evsel ==NULL ) {
@@ -63,7 +63,7 @@ int test__perf_evsel__tp_sched_test(void)perf_evsel__delete (evsel); - evsel =perf_evsel__newtp ("sched" ,"sched_wakeup" ,0 ); + evsel =perf_evsel__newtp ("sched" ,"sched_wakeup" );if (perf_evsel__test_field (evsel,"comm" ,16 , true)) ret =-1 ;
tools/perf/tests/mmap-basic.c +1 -1
@@ -65,7 +65,7 @@ int test__basic_mmap(void)char name[64 ];snprintf (name,sizeof (name),"sys_enter_%s" , syscall_names[i]); - evsels[i] =perf_evsel__newtp ("syscalls" , name, i); + evsels[i] =perf_evsel__newtp ("syscalls" , name);if (evsels[i] ==NULL ) {pr_debug ("perf_evsel__new\n" ); goto out_free_evlist;
tools/perf/tests/open-syscall-all-cpus.c +1 -1
@@ -26,7 +26,7 @@ int test__open_syscall_event_on_all_cpus(void)CPU_ZERO (&cpu_set); - evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_open" ,0 ); + evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_open" );if (evsel ==NULL ) {pr_debug ("is debugfs mounted on /sys/kernel/debug?\n" ); goto out_thread_map_delete;
tools/perf/tests/open-syscall-tp-fields.c +1 -1
@@ -27,7 +27,7 @@ int test__syscall_open_tp_fields(void) goto out; } - evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_open" ,0 ); + evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_open" );if (evsel ==NULL ) {pr_debug ("%s: perf_evsel__newtp\n" , __func__); goto out_delete_evlist;
tools/perf/tests/open-syscall.c +1 -1
@@ -15,7 +15,7 @@ int test__open_syscall_event(void)return -1 ; } - evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_open" ,0 ); + evsel =perf_evsel__newtp ("syscalls" ,"sys_enter_open" );if (evsel ==NULL ) {pr_debug ("is debugfs mounted on /sys/kernel/debug?\n" ); goto out_thread_map_delete;
tools/perf/tests/sw-clock.c +11 -4
@@ -9,7 +9,7 @@#include "util/cpumap.h" #include "util/thread_map.h" -#define NR_LOOPS 1000000 +#define NR_LOOPS 10000000/* * This test will open software clock events (cpu-clock, task-clock)
@@ -34,7 +34,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) .freq = 1, }; - attr.sample_freq =10000 ; + attr.sample_freq =500 ; evlist =perf_evlist__new ();if (evlist ==NULL ) {
@@ -42,7 +42,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)return -1 ; } - evsel =perf_evsel__new (&attr,0 ); + evsel =perf_evsel__new (&attr);if (evsel ==NULL ) {pr_debug ("perf_evsel__new\n" ); goto out_free_evlist;
@@ -57,7 +57,14 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) goto out_delete_maps; } -perf_evlist__open (evlist); +if (perf_evlist__open (evlist)) { +const char *knob ="/proc/sys/kernel/perf_event_max_sample_rate" ; + + err = -errno; +pr_debug ("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64" in this test.\n" , +strerror (errno), knob, (u64 )attr.sample_freq); + goto out_delete_maps; + } err =perf_evlist__mmap (evlist,128 , true);if (err <0 ) {
tools/perf/tests/task-exit.c +1 -1
@@ -28,7 +28,7 @@ int test__task_exit(void)union perf_event *event;struct perf_evsel *evsel;struct perf_evlist *evlist; -struct perf_target target = { +struct target target = { .uid =UINT_MAX , .uses_mmap = true, };
tools/perf/ui/tui/progress.c +2 -1
@@ -18,13 +18,14 @@ static void tui_progress__update(struct ui_progress *p)if (p->total ==0 )return ; -ui__refresh_dimensions (true); +ui__refresh_dimensions (false);pthread_mutex_lock (&ui__lock); y = SLtt_Screen_Rows /2 -2 ;SLsmg_set_color (0 );SLsmg_draw_box (y,0 ,3 , SLtt_Screen_Cols);SLsmg_gotorc (y++,1 );SLsmg_write_string ((char *)p->title); +SLsmg_fill_region (y,1 ,1 , SLtt_Screen_Cols -2 ,' ' );SLsmg_set_color (HE_COLORSET_SELECTED ); bar = ((SLtt_Screen_Cols -2 ) * p->curr) / p->total;SLsmg_fill_region (y,1 ,1 , bar,' ' );
tools/perf/util/event.c +30 -20
126 lines not on this page · raw message
tools/perf/util/event.h +2 -2
@@ -208,10 +208,10 @@ typedef int (*perf_event__handler_t)(struct perf_tool *tool,int perf_event__synthesize_thread_map (struct perf_tool *tool,struct thread_map *threads,perf_event__handler_t process, -struct machine *machine); +struct machine *machine,bool mmap_data);int perf_event__synthesize_threads (struct perf_tool *tool,perf_event__handler_t process, -struct machine *machine); +struct machine *machine,bool mmap_data); int perf_event__synthesize_kernel_mmap(struct perf_tool *tool, perf_event__handler_t process, struct machine *machine,
tools/perf/util/evlist.c +43 -30
149 lines not on this page · raw message
tools/perf/util/evlist.h +2 -3
@@ -102,7 +102,7 @@ void perf_evlist__config(struct perf_evlist *evlist,int perf_record_opts__config (struct perf_record_opts *opts);int perf_evlist__prepare_workload (struct perf_evlist *evlist, -struct perf_target *target, +struct target *target,const char *argv[],bool pipe_output,bool want_signal);int perf_evlist__start_workload (struct perf_evlist *evlist);
@@ -134,8 +134,7 @@ static inline void perf_evlist__set_maps(struct perf_evlist *evlist, evlist->threads = threads; } -int perf_evlist__create_maps (struct perf_evlist *evlist, -struct perf_target *target); +int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target);void perf_evlist__delete_maps (struct perf_evlist *evlist);int perf_evlist__apply_filters (struct perf_evlist *evlist);
tools/perf/util/evsel.c +6 -7
@@ -168,7 +168,7 @@ void perf_evsel__init(struct perf_evsel *evsel,perf_evsel__calc_id_pos (evsel); } -struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr,int idx) +struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx) {struct perf_evsel *evsel =zalloc (sizeof (*evsel));
@@ -219,7 +219,7 @@ out:return format; } -struct perf_evsel *perf_evsel__newtp (const char *sys,const char *name,int idx) +struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx) {struct perf_evsel *evsel =zalloc (sizeof (*evsel));
@@ -645,7 +645,7 @@ void perf_evsel__config(struct perf_evsel *evsel, } } -if (perf_target__has_cpu (&opts->target)) +if (target__has_cpu (&opts->target))perf_evsel__set_sample_bit (evsel,CPU );if (opts->period)
@@ -653,7 +653,7 @@ void perf_evsel__config(struct perf_evsel *evsel,if (!perf_missing_features.sample_id_all && (opts->sample_time || !opts->no_inherit || -perf_target__has_cpu (&opts->target))) +target__has_cpu (&opts->target)))perf_evsel__set_sample_bit (evsel,TIME );if (opts->raw_samples) {
@@ -696,7 +696,7 @@ void perf_evsel__config(struct perf_evsel *evsel,* Setting enable_on_exec for independent events and * group leaders for traced executed by perf. */ -if (perf_target__none (&opts->target) &&perf_evsel__is_group_leader (evsel)) +if (target__none (&opts->target) &&perf_evsel__is_group_leader (evsel)) attr->enable_on_exec =1 ; }
@@ -2006,8 +2006,7 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,return false; } -int perf_evsel__open_strerror (struct perf_evsel *evsel, -struct perf_target *target, +int perf_evsel__open_strerror (struct perf_evsel *evsel,struct target *target,int err,char *msg,size_t size) {switch (err) {
tools/perf/util/evsel.h +14 -4
@@ -96,8 +96,19 @@ struct thread_map;struct perf_evlist ;struct perf_record_opts ; -struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr,int idx); -struct perf_evsel *perf_evsel__newtp (const char *sys,const char *name,int idx); +struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx); + +static inline struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr) +{ +return perf_evsel__new_idx (attr,0 ); +} + +struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx); + +static inline struct perf_evsel *perf_evsel__newtp (const char *sys,const char *name) +{ +return perf_evsel__newtp_idx (sys, name,0 ); +}struct event_format *event_format__new (const char *sys,const char *name);
@@ -307,8 +318,7 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,bool perf_evsel__fallback (struct perf_evsel *evsel,int err,char *msg,size_t msgsize); -int perf_evsel__open_strerror (struct perf_evsel *evsel, -struct perf_target *target, +int perf_evsel__open_strerror (struct perf_evsel *evsel,struct target *target,int err,char *msg,size_t size);static inline int perf_evsel__group_idx (struct perf_evsel *evsel)
tools/perf/util/header.c +2 -2
@@ -2797,7 +2797,7 @@ int perf_session__read_header(struct perf_session *session)perf_event__attr_swap (&f_attr.attr); tmp =lseek (fd,0 ,SEEK_CUR ); - evsel =perf_evsel__new (&f_attr.attr, i); + evsel =perf_evsel__new (&f_attr.attr);if (evsel ==NULL ) goto out_delete_evlist;
@@ -2916,7 +2916,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused,return -ENOMEM ; } - evsel =perf_evsel__new (&event->attr.attr, evlist->nr_entries); + evsel =perf_evsel__new (&event->attr.attr);if (evsel ==NULL )return -ENOMEM ;
tools/perf/util/machine.c +12 -0
@@ -1394,3 +1394,15 @@ int machine__for_each_thread(struct machine *machine, }return rc; } + +int __machine__synthesize_threads (struct machine *machine,struct perf_tool *tool, +struct target *target,struct thread_map *threads, +perf_event__handler_t process,bool data_mmap) +{ +if (target__has_task (target)) +return perf_event__synthesize_thread_map (tool, threads, process, machine, data_mmap); +else if (target__has_cpu (target)) +return perf_event__synthesize_threads (tool, process, machine, data_mmap); +/* command specified */ +return 0 ; +}
tools/perf/util/machine.h +12 -0
@@ -4,6 +4,7 @@#include <sys/types.h> #include <linux/rbtree.h> #include "map.h" +#include "event.h" struct addr_location ;struct branch_stack ;
@@ -178,4 +179,15 @@ int machine__for_each_thread(struct machine *machine,int (*fn)(struct thread *thread,void *p), void *priv); +int __machine__synthesize_threads (struct machine *machine,struct perf_tool *tool, +struct target *target,struct thread_map *threads, +perf_event__handler_t process,bool data_mmap); +static inline +int machine__synthesize_threads (struct machine *machine,struct target *target, +struct thread_map *threads,bool data_mmap) +{ +return __machine__synthesize_threads (machine,NULL , target, threads, + perf_event__process, data_mmap); +} +#endif /* __PERF_MACHINE_H */
tools/perf/util/parse-events.c +3 -3
@@ -277,7 +277,7 @@ static int __add_event(struct list_head *list, int *idx,event_attr_init (attr); - evsel =perf_evsel__new (attr, (*idx)++); + evsel =perf_evsel__new_idx (attr, (*idx)++);if (!evsel)return -ENOMEM ;
@@ -378,7 +378,7 @@ static int add_tracepoint(struct list_head *list, int *idx, {struct perf_evsel *evsel; - evsel =perf_evsel__newtp (sys_name, evt_name, (*idx)++); + evsel =perf_evsel__newtp_idx (sys_name, evt_name, (*idx)++);if (!evsel)return -ENOMEM ;
@@ -1097,7 +1097,7 @@ static bool is_event_supported(u8 type, unsigned config) .threads = { 0 }, }; - evsel =perf_evsel__new (&attr,0 ); + evsel =perf_evsel__new (&attr);if (evsel) { ret =perf_evsel__open (evsel,NULL , &tmap.map) >=0 ;perf_evsel__delete (evsel);
tools/perf/util/sort.c +13 -0
@@ -1137,6 +1137,8 @@ static void sort_entry__setup_elide(struct sort_entry *se,void sort__setup_elide (FILE *output) { +struct sort_entry *se; +sort_entry__setup_elide (&sort_dso, symbol_conf.dso_list,"dso" , output); sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list,
@@ -1172,4 +1174,15 @@ void sort__setup_elide(FILE *output) "snoop", output); } +/* +* It makes no sense to elide all of sort entries. +* Just revert them to show up again. +*/ +list_for_each_entry (se, &hist_entry__sort_list, list) { +if (!se->elide) +return ; + } + +list_for_each_entry (se, &hist_entry__sort_list, list) + se->elide = false; }
tools/perf/util/target.c +26 -28
134 lines not on this page · raw message
tools/perf/util/target.h +21 -23
78 lines not on this page · raw message
tools/perf/util/top.c +1 -1
@@ -27,7 +27,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)float ksamples_per_sec;float esamples_percent;struct perf_record_opts *opts = &top->record_opts; -struct perf_target *target = &opts->target; +struct target *target = &opts->target;size_t ret =0 ;if (top->samples) {