perf tools: Resolve machine earlier and pass it to perf_event_ops
Commit-ID: 743eb868657bdb1b26c7b24077ca21c67c82c777 Gitweb: http://git.kernel.org/tip/743eb868657bdb1b26c7b24077ca21c67c82c777 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 28 Nov 2011 07:56:39 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 28 Nov 2011 10:39:12 -0200
perf tools: Resolve machine earlier and pass it to perf_event_ops
Reducing the exposure of perf_session further, so that we can use the classes in cases where no perf.data file is created.
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-annotate.c | 4 +- tools/perf/builtin-diff.c | 9 +- tools/perf/builtin-inject.c | 70 +++++---- tools/perf/builtin-kmem.c | 4 +- tools/perf/builtin-lock.c | 4 +- tools/perf/builtin-record.c | 38 +++--- tools/perf/builtin-report.c | 24 ++-- tools/perf/builtin-sched.c | 70 +++++----- tools/perf/builtin-script.c | 26 ++-- tools/perf/builtin-timechart.c | 8 +- tools/perf/builtin-top.c | 99 +++++++------ tools/perf/util/build-id.c | 16 +- tools/perf/util/event.c | 151 ++++++++----------- tools/perf/util/event.h | 21 ++-- tools/perf/util/header.c | 28 ++-- tools/perf/util/header.h | 16 +-- tools/perf/util/map.h | 10 ++ .../perf/util/scripting-engines/trace-event-perl.c | 4 +- .../util/scripting-engines/trace-event-python.c | 4 +- tools/perf/util/session.c | 91 +++++++----- tools/perf/util/session.h | 30 ++-- tools/perf/util/thread.h | 14 +-- tools/perf/util/trace-event-scripting.c | 2 +- tools/perf/util/trace-event.h | 8 +- 24 files changed, 376 insertions(+), 375 deletions(-)
tools/perf/builtin-annotate.c +2 -2
@@ -83,12 +83,12 @@ static int process_sample_event(struct perf_event_ops *ops,union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel, - struct perf_session *session) + struct machine *machine) { struct perf_annotate *ann = container_of(ops, struct perf_annotate, ops);struct addr_location al; -if (perf_event__preprocess_sample (event, session, &al, sample, +if (perf_event__preprocess_sample (event, machine, &al, sample, symbol__annotate_init) <0 ) {pr_warning ("problem processing %d event, skipping it.\n" , event->header.type);
tools/perf/builtin-diff.c +5 -4
@@ -9,6 +9,7 @@#include "util/debug.h" #include "util/event.h" #include "util/hist.h" +#include "util/evsel.h" #include "util/session.h" #include "util/sort.h" #include "util/symbol.h"
@@ -34,11 +35,11 @@ static int diff__process_sample_event(struct perf_event_ops *ops __used,union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel __used, - struct perf_session *session) + struct machine *machine) { struct addr_location al; -if (perf_event__preprocess_sample (event, session, &al, sample,NULL ) <0 ) { +if (perf_event__preprocess_sample (event, machine, &al, sample,NULL ) <0 ) {pr_warning ("problem processing %d event, skipping it.\n" , event->header.type);return -1 ;
@@ -47,12 +48,12 @@ static int diff__process_sample_event(struct perf_event_ops *ops __used,if (al.filtered || al.sym ==NULL )return 0 ; -if (hists__add_entry (&session->hists, &al, sample->period)) { +if (hists__add_entry (&evsel->hists, &al, sample->period)) {pr_warning ("problem incrementing symbol period, skipping event\n" );return -1 ; } - session->hists.stats.total_period += sample->period; + evsel->hists.stats.total_period += sample->period;return 0 ; }
tools/perf/builtin-inject.c +38 -32
178 lines not on this page · raw message
tools/perf/builtin-kmem.c +2 -2
@@ -307,9 +307,9 @@ static int process_sample_event(struct perf_event_ops *ops __used,union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel __used, - struct perf_session *session) + struct machine *machine) { - struct thread *thread = perf_session__findnew(session, event->ip.pid); + struct thread *thread = machine__findnew_thread(machine, event->ip.pid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-lock.c +2 -2
@@ -849,9 +849,9 @@ static int process_sample_event(struct perf_event_ops *ops __used,union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel __used, - struct perf_session *s) + struct machine *machine) { - struct thread *thread = perf_session__findnew(s, sample->tid); + struct thread *thread = machine__findnew_thread(machine, sample->tid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
tools/perf/builtin-record.c +17 -21
@@ -79,7 +79,7 @@ static void write_output(struct perf_record *rec, void *buf, size_t size)static int process_synthesized_event (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample__used , -struct perf_session *self__used ) +struct machine *machine__used ) { struct perf_record *rec = container_of(ops, struct perf_record, ops);write_output (rec, event, event->header.size);
@@ -320,8 +320,6 @@ static void perf_event__synthesize_guest_os(struct machine *machine, void *data) {int err;struct perf_event_ops *ops = data; - struct perf_record *rec = container_of(ops, struct perf_record, ops); -struct perf_session *psession = rec->session;if (machine__is_host (machine))return ;
@@ -335,7 +333,7 @@ static void perf_event__synthesize_guest_os(struct machine *machine, void *data)*in module instead of in guest kernel. */ err =perf_event__synthesize_modules (ops, process_synthesized_event, - psession, machine); + machine);if (err <0 )pr_err ("Couldn't record guest kernel [%d]'s reference" " relocation symbol.\n" , machine->pid);
@@ -345,11 +343,10 @@ static void perf_event__synthesize_guest_os(struct machine *machine, void *data)* have no _text sometimes. */ err =perf_event__synthesize_kernel_mmap (ops, process_synthesized_event, - psession, machine,"_text" ); + machine,"_text" );if (err <0 ) err =perf_event__synthesize_kernel_mmap (ops, process_synthesized_event, - psession, machine, -"_stext" ); + machine,"_stext" );if (err <0 )pr_err ("Couldn't record guest kernel [%d]'s reference" " relocation symbol.\n" , machine->pid);
@@ -497,6 +494,12 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) rec->post_processing_offset =lseek (output,0 ,SEEK_CUR ); + machine =perf_session__find_host_machine (session); +if (!machine) { +pr_err ("Couldn't find native kernel information.\n" ); +return -1 ; + } +if (opts->pipe_output) { err =perf_event__synthesize_attrs (ops, session, process_synthesized_event);
@@ -506,7 +509,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) } err =perf_event__synthesize_event_types (ops, process_synthesized_event, - session); + machine);if (err <0 ) {pr_err ("Couldn't synthesize event_types.\n" );return err;
@@ -522,8 +525,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)* propagate errors that now are calling die() */ err =perf_event__synthesize_tracing_data (ops, output, evsel_list, - process_synthesized_event, - session); + process_synthesized_event);if (err <=0 ) {pr_err ("Couldn't record tracing data.\n" );return err;
@@ -532,24 +534,18 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) } } - machine =perf_session__find_host_machine (session); -if (!machine) { -pr_err ("Couldn't find native kernel information.\n" ); -return -1 ; - } - err =perf_event__synthesize_kernel_mmap (ops, process_synthesized_event, - session, machine,"_text" ); + machine,"_text" );if (err <0 ) err =perf_event__synthesize_kernel_mmap (ops, process_synthesized_event, - session, machine,"_stext" ); + machine,"_stext" );if (err <0 )pr_err ("Couldn't record kernel reference relocation symbol\n" "Symbol resolution may be skewed if relocation was used (e.g. kexec).\n" "Check /proc/kallsyms permission or run as root.\n" ); err =perf_event__synthesize_modules (ops, process_synthesized_event, - session, machine); + machine);if (err <0 )pr_err ("Couldn't record kernel module information.\n" "Symbol resolution may be skewed if relocation was used (e.g. kexec).\n"
@@ -562,10 +558,10 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)if (!opts->system_wide)perf_event__synthesize_thread_map (ops, evsel_list->threads, process_synthesized_event, - session); + machine);else perf_event__synthesize_threads (ops, process_synthesized_event, - session); + machine);if (rec->realtime_prio) {struct sched_param param;
tools/perf/builtin-report.c +12 -12
@@ -52,18 +52,18 @@ struct perf_report {DECLARE_BITMAP (cpu_bitmap,MAX_NR_CPUS ); }; -static int perf_session__add_hist_entry (struct perf_session *session, -struct addr_location *al, -struct perf_sample *sample, -struct perf_evsel *evsel) +static int perf_evsel__add_hist_entry (struct perf_evsel *evsel, +struct addr_location *al, +struct perf_sample *sample, +struct machine *machine) {struct symbol *parent =NULL ;int err =0 ;struct hist_entry *he;if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { - err =perf_session__resolve_callchain (session, evsel, al->thread, - sample->callchain, &parent); + err =machine__resolve_callchain (machine, evsel, al->thread, + sample->callchain, &parent);if (err)return err; }
@@ -107,12 +107,12 @@ static int process_sample_event(struct perf_event_ops *ops,union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel, - struct perf_session *session) + struct machine *machine) { struct perf_report *rep = container_of(ops, struct perf_report, ops);struct addr_location al; -if (perf_event__preprocess_sample (event, session, &al, sample, +if (perf_event__preprocess_sample (event, machine, &al, sample, rep->annotate_init) <0 ) {fprintf (stderr,"problem processing %d event, skipping it.\n" , event->header.type);
@@ -128,7 +128,7 @@ static int process_sample_event(struct perf_event_ops *ops,if (al.map !=NULL ) al.map->dso->hit =1 ; -if (perf_session__add_hist_entry (session, &al, sample, evsel)) { +if (perf_evsel__add_hist_entry (evsel, &al, sample, machine)) {pr_debug ("problem incrementing symbol period, skipping event\n" );return -1 ; }
@@ -139,11 +139,11 @@ static int process_sample_event(struct perf_event_ops *ops,static int process_read_event (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample__used , -struct perf_session *session) +struct perf_evsel *evsel, +struct machine *machine__used ) { struct perf_report *rep = container_of(ops, struct perf_report, ops); -struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, - event->read.id); +if (rep->show_threads) {const char *name = evsel ?event_name (evsel) :"unknown" ; perf_read_values_add_value(&rep->show_threads_values,
tools/perf/builtin-sched.c +35 -35
249 lines not on this page · raw message
tools/perf/builtin-script.c +13 -13
@@ -315,7 +315,7 @@ static bool sample_addr_correlates_sym(struct perf_event_attr *attr)static void print_sample_addr (union perf_event *event,struct perf_sample *sample, -struct perf_session *session, +struct machine *machine,struct thread *thread,struct perf_event_attr *attr) {
@@ -328,11 +328,11 @@ static void print_sample_addr(union perf_event *event,if (!sample_addr_correlates_sym (attr))return ; -thread__find_addr_map (thread, session, cpumode,MAP__FUNCTION , - event->ip.pid, sample->addr, &al); +thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , + sample->addr, &al);if (!al.map) -thread__find_addr_map (thread, session, cpumode,MAP__VARIABLE , - event->ip.pid, sample->addr, &al); +thread__find_addr_map (thread, machine, cpumode,MAP__VARIABLE , + sample->addr, &al); al.cpu = sample->cpu; al.sym =NULL ;
@@ -362,7 +362,7 @@ static void print_sample_addr(union perf_event *event, static void process_event(union perf_event *event __unused,struct perf_sample *sample,struct perf_evsel *evsel, -struct perf_session *session, +struct machine *machine,struct thread *thread) {struct perf_event_attr *attr = &evsel->attr;
@@ -377,15 +377,15 @@ static void process_event(union perf_event *event __unused, sample->raw_size);if (PRINT_FIELD (ADDR )) -print_sample_addr (event, sample, session, thread, attr); +print_sample_addr (event, sample, machine, thread, attr);if (PRINT_FIELD (IP )) {if (!symbol_conf.use_callchain)printf (" " );else printf ("\n" ); -perf_session__print_ip (event, evsel, sample, session, -PRINT_FIELD (SYM ),PRINT_FIELD (DSO )); +perf_event__print_ip (event, sample, machine, evsel, +PRINT_FIELD (SYM ),PRINT_FIELD (DSO )); }printf ("\n" );
@@ -438,9 +438,9 @@ static int process_sample_event(struct perf_event_ops *ops __used,union perf_event *event, struct perf_sample *sample, struct perf_evsel *evsel, - struct perf_session *session) + struct machine *machine) { - struct thread *thread = perf_session__findnew(session, event->ip.pid); + struct thread *thread = machine__findnew_thread(machine, event->ip.pid);if (thread ==NULL ) { pr_debug("problem processing %d event, skipping it.\n",
@@ -462,9 +462,9 @@ static int process_sample_event(struct perf_event_ops *ops __used,if (cpu_list && !test_bit (sample->cpu, cpu_bitmap))return 0 ; - scripting_ops->process_event (event, sample, evsel, session, thread); + scripting_ops->process_event (event, sample, evsel, machine, thread); - session->hists.stats.total_period += sample->period; + evsel->hists.stats.total_period += sample->period;return 0 ; }
tools/perf/builtin-timechart.c +4 -4
@@ -277,7 +277,7 @@ static u64 cpus_pstate_state[MAX_CPUS];static int process_comm_event (struct perf_event_ops *ops__used ,union perf_event *event,struct perf_sample *sample__used , -struct perf_session *session__used ) +struct machine *machine__used ) {pid_set_comm (event->comm.tid, event->comm.comm);return 0 ;
@@ -286,7 +286,7 @@ static int process_comm_event(struct perf_event_ops *ops __used,static int process_fork_event (struct perf_event_ops *ops__used ,union perf_event *event,struct perf_sample *sample__used , -struct perf_session *session__used ) +struct machine *machine__used ) {pid_fork (event->fork.pid, event->fork.ppid, event->fork.time);return 0 ;
@@ -295,7 +295,7 @@ static int process_fork_event(struct perf_event_ops *ops __used,static int process_exit_event (struct perf_event_ops *ops__used ,union perf_event *event,struct perf_sample *sample__used , -struct perf_session *session__used ) +struct machine *machine__used ) {pid_exit (event->fork.pid, event->fork.time);return 0 ;
@@ -494,7 +494,7 @@ static int process_sample_event(struct perf_event_ops *ops __used,union perf_event *event__used , struct perf_sample *sample, struct perf_evsel *evsel, - struct perf_session *session __used) + struct machine *machine __used) { struct trace_entry *te;
tools/perf/builtin-top.c +51 -48
160 lines not on this page · raw message
tools/perf/util/build-id.c +8 -8
@@ -19,11 +19,11 @@ static int build_id__mark_dso_hit(struct perf_event_ops *ops __used,union perf_event *event, struct perf_sample *sample __used, struct perf_evsel *evsel __used, - struct perf_session *session) + struct machine *machine) { struct addr_location al;u8 cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; -struct thread *thread =perf_session__findnew (session, event->ip.pid); +struct thread *thread =machine__findnew_thread (machine, event->ip.pid);if (thread ==NULL ) { pr_err("problem processing %d event, skipping it.\n",
@@ -31,8 +31,8 @@ static int build_id__mark_dso_hit(struct perf_event_ops *ops __used,return -1 ; } -thread__find_addr_map (thread, session, cpumode,MAP__FUNCTION , - event->ip.pid, event->ip.ip, &al); +thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , + event->ip.ip, &al);if (al.map !=NULL ) al.map->dso->hit =1 ;
@@ -43,16 +43,16 @@ static int build_id__mark_dso_hit(struct perf_event_ops *ops __used,static int perf_event__exit_del_thread (struct perf_event_ops *ops__used ,union perf_event *event,struct perf_sample *sample__used , -struct perf_session *session) +struct machine *machine) { -struct thread *thread =perf_session__findnew (session, event->fork.tid); +struct thread *thread =machine__findnew_thread (machine, event->fork.tid);dump_printf ("(%d:%d):(%d:%d)\n" , event->fork.pid, event->fork.tid, event->fork.ppid, event->fork.ptid);if (thread) { -rb_erase (&thread->rb_node, &session->host_machine.threads); - session->host_machine.last_match =NULL ; +rb_erase (&thread->rb_node, &machine->threads); + machine->last_match =NULL ;thread__delete (thread); }
tools/perf/util/event.c +64 -87
425 lines not on this page · raw message
tools/perf/util/event.h +9 -12
@@ -142,56 +142,53 @@ union perf_event {void perf_event__print_totals (void );struct perf_event_ops ; -struct perf_session ;struct thread_map ;typedef int (*perf_event__handler_t )(struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);int perf_event__synthesize_thread_map (struct perf_event_ops *ops,struct thread_map *threads,perf_event__handler_t process, -struct perf_session *session); +struct machine *machine);int perf_event__synthesize_threads (struct perf_event_ops *ops,perf_event__handler_t process, -struct perf_session *session); +struct machine *machine);int perf_event__synthesize_kernel_mmap (struct perf_event_ops *ops,perf_event__handler_t process, -struct perf_session *session,struct machine *machine,const char *symbol_name);int perf_event__synthesize_modules (struct perf_event_ops *ops,perf_event__handler_t process, -struct perf_session *session,struct machine *machine);int perf_event__process_comm (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);int perf_event__process_lost (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);int perf_event__process_mmap (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);int perf_event__process_task (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);int perf_event__process (struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);struct addr_location ;int perf_event__preprocess_sample (const union perf_event *self, -struct perf_session *session, +struct machine *machine,struct addr_location *al,struct perf_sample *sample,symbol_filter_t filter);
tools/perf/util/header.c +12 -16
@@ -2072,8 +2072,7 @@ out_delete_evlist:int perf_event__synthesize_attr (struct perf_event_ops *ops,struct perf_event_attr *attr,u16 ids,u64 *id, -perf_event__handler_t process, -struct perf_session *session) +perf_event__handler_t process) {union perf_event *ev;size_t size;
@@ -2095,7 +2094,7 @@ int perf_event__synthesize_attr(struct perf_event_ops *ops, ev->attr.header.type =PERF_RECORD_HEADER_ATTR ; ev->attr.header.size = size; - err =process (ops, ev,NULL , session); + err =process (ops, ev,NULL ,NULL );free (ev);
@@ -2111,7 +2110,7 @@ int perf_event__synthesize_attrs(struct perf_event_ops *ops,list_for_each_entry (attr, &session->evlist->entries, node) { err =perf_event__synthesize_attr (ops, &attr->attr, attr->ids, - attr->id, process, session); + attr->id, process);if (err) {pr_debug ("failed to create perf header attribute\n" );return err;
@@ -2161,7 +2160,7 @@ int perf_event__process_attr(union perf_event *event,int perf_event__synthesize_event_type (struct perf_event_ops *ops,u64 event_id,char *name,perf_event__handler_t process, -struct perf_session *session) +struct machine *machine) {union perf_event ev;size_t size =0 ;
@@ -2179,14 +2178,14 @@ int perf_event__synthesize_event_type(struct perf_event_ops *ops, ev.event_type.header.size =sizeof (ev.event_type) - (sizeof (ev.event_type.event_type.name) - size); - err =process (ops, &ev,NULL , session); + err =process (ops, &ev,NULL , machine);return err; }int perf_event__synthesize_event_types (struct perf_event_ops *ops,perf_event__handler_t process, -struct perf_session *session) +struct machine *machine) {struct perf_trace_event_type *type;int i, err =0 ;
@@ -2196,7 +2195,7 @@ int perf_event__synthesize_event_types(struct perf_event_ops *ops, err =perf_event__synthesize_event_type (ops, type->event_id, type->name, process, - session); + machine);if (err) {pr_debug ("failed to create perf header event type\n" );return err;
@@ -2207,8 +2206,7 @@ int perf_event__synthesize_event_types(struct perf_event_ops *ops, } int perf_event__process_event_type(struct perf_event_ops *ops __unused, -union perf_event *event, - struct perf_session *session __unused) +union perf_event *event) {if (perf_header__push_event (event->event_type.event_type.event_id, event->event_type.event_type.name) <0 )
@@ -2219,8 +2217,7 @@ int perf_event__process_event_type(struct perf_event_ops *ops __unused,int perf_event__synthesize_tracing_data (struct perf_event_ops *ops,int fd,struct perf_evlist *evlist, -perf_event__handler_t process, - struct perf_session *session __unused) +perf_event__handler_t process) {union perf_event ev;struct tracing_data *tdata;
@@ -2251,7 +2248,7 @@ int perf_event__synthesize_tracing_data(struct perf_event_ops *ops, int fd, ev.tracing_data.header.size =sizeof (ev.tracing_data); ev.tracing_data.size = aligned_size; -process (ops, &ev,NULL , session); +process (ops, &ev,NULL ,NULL );/* * The put function will copy all the tracing data
@@ -2296,8 +2293,7 @@ int perf_event__process_tracing_data(union perf_event *event,int perf_event__synthesize_build_id (struct perf_event_ops *ops,struct dso *pos,u16 misc,perf_event__handler_t process, -struct machine *machine, -struct perf_session *session) +struct machine *machine) {union perf_event ev;size_t len;
@@ -2317,7 +2313,7 @@ int perf_event__synthesize_build_id(struct perf_event_ops *ops, ev.build_id.header.size =sizeof (ev.build_id) + len;memcpy (&ev.build_id.filename, pos->long_name, pos->long_name_len); - err =process (ops, &ev,NULL , session); + err =process (ops, &ev,NULL , machine);return err; }
tools/perf/util/header.h +6 -10
@@ -99,8 +99,7 @@ int build_id_cache__remove_s(const char *sbuild_id, const char *debugdir);int perf_event__synthesize_attr (struct perf_event_ops *ops,struct perf_event_attr *attr,u16 ids,u64 *id, -perf_event__handler_t process, -struct perf_session *session); +perf_event__handler_t process);int perf_event__synthesize_attrs (struct perf_event_ops *ops,struct perf_session *session,perf_event__handler_t process);
@@ -109,26 +108,23 @@ int perf_event__process_attr(union perf_event *event, struct perf_evlist **pevliint perf_event__synthesize_event_type (struct perf_event_ops *ops,u64 event_id,char *name,perf_event__handler_t process, -struct perf_session *session); +struct machine *machine);int perf_event__synthesize_event_types (struct perf_event_ops *ops,perf_event__handler_t process, -struct perf_session *session); +struct machine *machine);int perf_event__process_event_type (struct perf_event_ops *ops, -union perf_event *event, -struct perf_session *session); +union perf_event *event);int perf_event__synthesize_tracing_data (struct perf_event_ops *ops,int fd,struct perf_evlist *evlist, -perf_event__handler_t process, -struct perf_session *session); +perf_event__handler_t process);int perf_event__process_tracing_data (union perf_event *event,struct perf_session *session);int perf_event__synthesize_build_id (struct perf_event_ops *ops,struct dso *pos,u16 misc,perf_event__handler_t process, -struct machine *machine, -struct perf_session *session); +struct machine *machine);int perf_event__process_build_id (struct perf_event_ops *ops,union perf_event *event,struct perf_session *session);
tools/perf/util/map.h +10 -0
@@ -18,9 +18,11 @@ enum map_type {extern const char *map_type__name[MAP__NR_TYPES ];struct dso ; +struct ip_callchain ;struct ref_reloc_sym ;struct map_groups ;struct machine ; +struct perf_evsel ; struct map { union {
@@ -61,6 +63,7 @@ struct map_groups {struct machine {struct rb_node rb_node;pid_t pid; +u16 id_hdr_size;char *root_dir;struct rb_root threads;struct list_head dead_threads;
@@ -151,6 +154,13 @@ int machine__init(struct machine *self, const char *root_dir, pid_t pid);void machine__exit (struct machine *self);void machine__delete (struct machine *self); +int machine__resolve_callchain (struct machine *machine, +struct perf_evsel *evsel,struct thread *thread, +struct ip_callchain *chain, +struct symbol **parent); +int maps__set_kallsyms_ref_reloc_sym (struct map **maps,const char *symbol_name, +u64 addr); +/* * Default guest kernel is defined by parameter --guestkallsyms * and --guestmodules
tools/perf/util/scripting-engines/trace-event-perl.c +3 -1
@@ -27,6 +27,8 @@#include "../../perf.h" #include "../util.h" +#include "../thread.h" +#include "../event.h" #include "../trace-event.h" #include <EXTERN.h>
@@ -248,7 +250,7 @@ static inline struct event *find_cache_event(int type) static void perl_process_event(union perf_event *pevent __unused,struct perf_sample *sample,struct perf_evsel *evsel, - struct perf_session *session __unused, + struct machine *machine __unused,struct thread *thread) {struct format_field *field;
tools/perf/util/scripting-engines/trace-event-python.c +3 -1
@@ -29,6 +29,8 @@#include "../../perf.h" #include "../util.h" +#include "../event.h" +#include "../thread.h" #include "../trace-event.h" PyMODINIT_FUNC initperf_trace_context (void );
@@ -207,7 +209,7 @@ static inline struct event *find_cache_event(int type) static void python_process_event(union perf_event *pevent __unused,struct perf_sample *sample, struct perf_evsel *evsel __unused, - struct perf_session *session __unused, + struct machine *machine __unused,struct thread *thread) {PyObject *handler, *retval, *context, *t, *obj, *dict =NULL ;
tools/perf/util/session.c +53 -38
210 lines not on this page · raw message
tools/perf/util/session.h +15 -15
@@ -58,32 +58,34 @@ struct perf_event_ops;typedef int (*event_sample )(struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_evsel *evsel,struct perf_session *session); +struct perf_evsel *evsel,struct machine *machine);typedef int (*event_op )(struct perf_event_ops *ops,union perf_event *event,struct perf_sample *sample, -struct perf_session *session); +struct machine *machine);typedef int (*event_synth_op )(union perf_event *self,struct perf_session *session);typedef int (*event_attr_op )(union perf_event *event,struct perf_evlist **pevlist); +typedef int (*event_simple_op )(struct perf_event_ops *ops, +union perf_event *event);typedef int (*event_op2 )(struct perf_event_ops *ops,union perf_event *event,struct perf_session *session);struct perf_event_ops { -event_sample sample; +event_sample sample, + read;event_op mmap, comm, fork, exit, lost, - read, throttle, unthrottle;event_attr_op attr;event_synth_op tracing_data; -event_op2 event_type, - build_id, - finished_round; +event_simple_op event_type; +event_op2 finished_round, + build_id;bool ordered_samples;bool ordering_requires_timestamps; };
@@ -108,10 +110,6 @@ int perf_session__resolve_callchain(struct perf_session *self, struct perf_evselbool perf_session__has_traces (struct perf_session *self,const char *msg); -int perf_session__set_kallsyms_ref_reloc_sym (struct map **maps, -const char *symbol_name, -u64 addr); -void mem_bswap_64 (void *src,int byte_size);void perf_event__attr_swap (struct perf_event_attr *attr);
@@ -151,6 +149,9 @@ void perf_session__process_machines(struct perf_session *self,return machines__process (&self->machines, process, ops); } +struct thread *perf_session__findnew (struct perf_session *self,pid_t pid); +size_t perf_session__fprintf (struct perf_session *self,FILE *fp); +size_t perf_session__fprintf_dsos (struct perf_session *self,FILE *fp); size_t perf_session__fprintf_dsos_buildid(struct perf_session *self,
@@ -171,10 +172,9 @@ static inline int perf_session__parse_sample(struct perf_session *session,struct perf_evsel *perf_session__find_first_evtype (struct perf_session *session,unsigned int type); -void perf_session__print_ip (union perf_event *event,struct perf_evsel *evsel, -struct perf_sample *sample, -struct perf_session *session, -int print_sym,int print_dso); +void perf_event__print_ip (union perf_event *event,struct perf_sample *sample, +struct machine *machine,struct perf_evsel *evsel, +int print_sym,int print_dso);int perf_session__cpu_bitmap (struct perf_session *session,const char *cpu_list,unsigned long *cpu_bitmap);
tools/perf/util/thread.h +5 -9
@@ -18,16 +18,14 @@ struct thread {int comm_len; }; -struct perf_session ; +struct machine ;void thread__delete (struct thread *self);int thread__set_comm (struct thread *self,const char *comm);int thread__comm_len (struct thread *self); -struct thread *perf_session__findnew (struct perf_session *self,pid_t pid);void thread__insert_map (struct thread *self,struct map *map);int thread__fork (struct thread *self,struct thread *parent); -size_t perf_session__fprintf (struct perf_session *self,FILE *fp);static inline struct map *thread__find_map (struct thread *self,enum map_type type,u64 addr)
@@ -35,14 +33,12 @@ static inline struct map *thread__find_map(struct thread *self, return self ? map_groups__find(&self->mg, type, addr) : NULL; } -void thread__find_addr_map (struct thread *self, -struct perf_session *session,u8 cpumode, -enum map_type type,pid_t pid,u64 addr, +void thread__find_addr_map (struct thread *thread,struct machine *machine, +u8 cpumode,enum map_type type,u64 addr,struct addr_location *al); -void thread__find_addr_location (struct thread *self, -struct perf_session *session,u8 cpumode, -enum map_type type,pid_t pid,u64 addr, +void thread__find_addr_location (struct thread *thread,struct machine *machine, +u8 cpumode,enum map_type type,u64 addr,struct addr_location *al,symbol_filter_t filter);#endif /* __PERF_THREAD_H */
tools/perf/util/trace-event-scripting.c +1 -1
@@ -39,7 +39,7 @@ static int stop_script_unsupported(void) static void process_event_unsupported(union perf_event *event __unused, struct perf_sample *sample __unused, struct perf_evsel *evsel __unused, - struct perf_session *session __unused, + struct machine *machine __unused, struct thread *thread __unused) { }
tools/perf/util/trace-event.h +6 -2
@@ -3,7 +3,11 @@#include <stdbool.h> #include "parse-events.h" -#include "session.h" + +struct machine ; +struct perf_sample ; +union perf_event ; +struct thread ;#define __unused __attribute__((unused))
@@ -292,7 +296,7 @@ struct scripting_ops {void (*process_event) (union perf_event *event,struct perf_sample *sample,struct perf_evsel *evsel, -struct perf_session *session, +struct machine *machine,struct thread *thread);int (*generate_script) (const char *outfile); };