perf machine: Introduce struct machines
Commit-ID: 876650e6c3209861a8949111140d805b3440951f Gitweb: http://git.kernel.org/tip/876650e6c3209861a8949111140d805b3440951f Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 18 Dec 2012 19:15:48 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 24 Jan 2013 16:40:12 -0300
perf machine: Introduce struct machines
That consolidates the grouping of host + guests, isolating a bit more of functionality now centered on 'perf_session' that can be used independently in tools that don't need a 'perf_session' instance, but needs to have all the thread/map/symbol machinery.
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-record.c | 4 +-- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 4 +-- tools/perf/tests/hists_link.c | 17 +++++------- tools/perf/util/header.c | 12 ++++---- tools/perf/util/machine.c | 64 ++++++++++++++++++++++++++++--------------- tools/perf/util/machine.h | 32 ++++++++++++++-------- tools/perf/util/session.c | 30 ++++++++------------ tools/perf/util/session.h | 11 ++------ 9 files changed, 95 insertions(+), 81 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -571,8 +571,8 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) "Check /proc/modules permission or run as root.\n");if (perf_guest) { -machines__process (&session->machines, - perf_event__synthesize_guest_os, tool); +machines__process_guests (&session->machines, + perf_event__synthesize_guest_os, tool); }if (!opts->target.system_wide)
tools/perf/builtin-report.c +1 -1
@@ -372,7 +372,7 @@ static int __cmd_report(struct perf_report *rep)if (ret) goto out_delete; - kernel_map = session->host_machine.vmlinux_maps[MAP__FUNCTION ]; + kernel_map = session->machines.host.vmlinux_maps[MAP__FUNCTION ]; kernel_kmap =map__kmap (kernel_map); if (kernel_map == NULL || (kernel_map->dso->hit &&
tools/perf/builtin-top.c +2 -2
@@ -966,10 +966,10 @@ static int __cmd_top(struct perf_top *top)if (perf_target__has_task (&opts->target))perf_event__synthesize_thread_map (&top->tool, top->evlist->threads, perf_event__process, - &top->session->host_machine); + &top->session->machines.host);else perf_event__synthesize_threads (&top->tool, perf_event__process, - &top->session->host_machine); + &top->session->machines.host);perf_top__start_counters (top); top->session->evlist = top->evlist;perf_session__set_id_hdr_size (top->session);
tools/perf/tests/hists_link.c +7 -10
@@ -75,13 +75,11 @@ static struct { { "[kernel]", kernel_syms, ARRAY_SIZE(kernel_syms) }, }; -static struct machine *setup_fake_machine (void ) +static struct machine *setup_fake_machine (struct machines *machines) { -struct rb_root machine_root =RB_ROOT ; -struct machine *machine; +struct machine *machine =machines__find (machines,HOST_KERNEL_ID );size_t i; - machine =machines__findnew (&machine_root,HOST_KERNEL_ID );if (machine ==NULL ) {pr_debug ("Not enough memory for machine setup\n" );return NULL ;
@@ -435,6 +433,7 @@ static void print_hists(struct hists *hists)int test__hists_link (void ) {int err =-1 ; +struct machines machines;struct machine *machine =NULL ;struct perf_evsel *evsel, *first;struct perf_evlist *evlist =perf_evlist__new (NULL ,NULL );
@@ -452,8 +451,10 @@ int test__hists_link(void)/* default sort order (comm,dso,sym) will be used */ setup_sorting (NULL ,NULL ); +machines__init (&machines); +/* setup threads/dso/map/symbols also */ - machine =setup_fake_machine (); + machine =setup_fake_machine (&machines);if (!machine) goto out;
@@ -492,11 +493,7 @@ int test__hists_link(void) out:/* tear down everything */ perf_evlist__delete (evlist); - -if (machine) { -machine__delete_threads (machine); -machine__delete (machine); - } +machines__exit (&machines);return err; }
tools/perf/util/header.c +6 -6
@@ -287,12 +287,12 @@ static int dsos__write_buildid_table(struct perf_header *header, int fd)struct perf_session *session =container_of (header, struct perf_session, header);struct rb_node *nd; -int err =machine__write_buildid_table (&session->host_machine, fd); +int err =machine__write_buildid_table (&session->machines.host, fd);if (err)return err; -for (nd =rb_first (&session->machines); nd; nd =rb_next (nd)) { +for (nd =rb_first (&session->machines.guests); nd; nd =rb_next (nd)) { struct machine *pos = rb_entry(nd, struct machine, rb_node); err =machine__write_buildid_table (pos, fd);if (err)
@@ -448,9 +448,9 @@ static int perf_session__cache_build_ids(struct perf_session *session)if (mkdir (debugdir,0755 ) !=0 && errno !=EEXIST )return -1 ; - ret =machine__cache_build_ids (&session->host_machine, debugdir); + ret =machine__cache_build_ids (&session->machines.host, debugdir); -for (nd =rb_first (&session->machines); nd; nd =rb_next (nd)) { +for (nd =rb_first (&session->machines.guests); nd; nd =rb_next (nd)) { struct machine *pos = rb_entry(nd, struct machine, rb_node); ret |=machine__cache_build_ids (pos, debugdir); }
@@ -467,9 +467,9 @@ static bool machine__read_build_ids(struct machine *machine, bool with_hits)static bool perf_session__read_build_ids (struct perf_session *session,bool with_hits) {struct rb_node *nd; -bool ret =machine__read_build_ids (&session->host_machine, with_hits); +bool ret =machine__read_build_ids (&session->machines.host, with_hits); -for (nd =rb_first (&session->machines); nd; nd =rb_next (nd)) { +for (nd =rb_first (&session->machines.guests); nd; nd =rb_next (nd)) { struct machine *pos = rb_entry(nd, struct machine, rb_node); ret |=machine__read_build_ids (pos, with_hits); }
tools/perf/util/machine.c +42 -22
153 lines not on this page · raw message
tools/perf/util/machine.h +20 -12
@@ -47,16 +47,24 @@ int machine__process_event(struct machine *machine, union perf_event *event);typedef void (*machine__process_t )(struct machine *machine,void *data); -void machines__process (struct rb_root *machines, -machine__process_t process,void *data); +struct machines { +struct machine host; +struct rb_root guests; +}; + +void machines__init (struct machines *machines); +void machines__exit (struct machines *machines); + +void machines__process_guests (struct machines *machines, +machine__process_t process,void *data); -struct machine *machines__add (struct rb_root *machines,pid_t pid, +struct machine *machines__add (struct machines *machines,pid_t pid,const char *root_dir); -struct machine *machines__find_host (struct rb_root *machines); -struct machine *machines__find (struct rb_root *machines,pid_t pid); -struct machine *machines__findnew (struct rb_root *machines,pid_t pid); +struct machine *machines__find_host (struct machines *machines); +struct machine *machines__find (struct machines *machines,pid_t pid); +struct machine *machines__findnew (struct machines *machines,pid_t pid); -void machines__set_id_hdr_size (struct rb_root *machines,u16 id_hdr_size); +void machines__set_id_hdr_size (struct machines *machines,u16 id_hdr_size);char *machine__mmap_name (struct machine *machine,char *bf,size_t size);int machine__init (struct machine *machine,const char *root_dir,pid_t pid);
@@ -132,17 +140,17 @@ int machine__load_vmlinux_path(struct machine *machine, enum map_type type,size_t machine__fprintf_dsos_buildid (struct machine *machine,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm); -size_t machines__fprintf_dsos (struct rb_root *machines,FILE *fp); -size_t machines__fprintf_dsos_buildid (struct rb_root *machines,FILE *fp, +size_t machines__fprintf_dsos (struct machines *machines,FILE *fp); +size_t machines__fprintf_dsos_buildid (struct machines *machines,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm);void machine__destroy_kernel_maps (struct machine *machine);int __machine__create_kernel_maps (struct machine *machine,struct dso *kernel);int machine__create_kernel_maps (struct machine *machine); -int machines__create_kernel_maps (struct rb_root *machines,pid_t pid); -int machines__create_guest_kernel_maps (struct rb_root *machines); -void machines__destroy_guest_kernel_maps (struct rb_root *machines); +int machines__create_kernel_maps (struct machines *machines,pid_t pid); +int machines__create_guest_kernel_maps (struct machines *machines); +void machines__destroy_kernel_maps (struct machines *machines);size_t machine__fprintf_vmlinux_path (struct machine *machine,FILE *fp);
tools/perf/util/session.c +12 -18
@@ -86,13 +86,12 @@ void perf_session__set_id_hdr_size(struct perf_session *session) {u16 id_hdr_size =perf_evlist__id_hdr_size (session->evlist); - session->host_machine.id_hdr_size = id_hdr_size;machines__set_id_hdr_size (&session->machines, id_hdr_size); }int perf_session__create_kernel_maps (struct perf_session *self) { -int ret =machine__create_kernel_maps (&self->host_machine); +int ret =machine__create_kernel_maps (&self->machines.host);if (ret >=0 ) ret =machines__create_guest_kernel_maps (&self->machines);
@@ -101,8 +100,7 @@ int perf_session__create_kernel_maps(struct perf_session *self)static void perf_session__destroy_kernel_maps (struct perf_session *self) { -machine__destroy_kernel_maps (&self->host_machine); -machines__destroy_guest_kernel_maps (&self->machines); +machines__destroy_kernel_maps (&self->machines); } struct perf_session *perf_session__new(const char *filename, int mode,
@@ -127,12 +125,11 @@ struct perf_session *perf_session__new(const char *filename, int mode, goto out;memcpy (self->filename, filename, len); - self->machines =RB_ROOT ; self->repipe = repipe;INIT_LIST_HEAD (&self->ordered_samples.samples);INIT_LIST_HEAD (&self->ordered_samples.sample_cache);INIT_LIST_HEAD (&self->ordered_samples.to_free); -machine__init (&self->host_machine,"" ,HOST_KERNEL_ID ); +machines__init (&self->machines);if (mode ==O_RDONLY ) {if (perf_session__open (self, force) <0 )
@@ -162,12 +159,12 @@ out_delete:static void perf_session__delete_dead_threads (struct perf_session *session) { -machine__delete_dead_threads (&session->host_machine); +machine__delete_dead_threads (&session->machines.host); }static void perf_session__delete_threads (struct perf_session *session) { -machine__delete_threads (&session->host_machine); +machine__delete_threads (&session->machines.host); }static void perf_session_env__delete (struct perf_session_env *env)
@@ -192,7 +189,7 @@ void perf_session__delete(struct perf_session *self)perf_session__delete_dead_threads (self);perf_session__delete_threads (self);perf_session_env__delete (&self->header.env); -machine__exit (&self->host_machine); +machines__exit (&self->machines);close (self->fd);free (self);vdso__exit ();
@@ -998,7 +995,7 @@ void perf_event_header__bswap(struct perf_event_header *self)struct thread *perf_session__findnew (struct perf_session *session,pid_t pid) { -return machine__findnew_thread (&session->host_machine, pid); +return machine__findnew_thread (&session->machines.host, pid); }static struct thread *perf_session__register_idle_thread (struct perf_session *self)
@@ -1335,16 +1332,13 @@ int maps__set_kallsyms_ref_reloc_sym(struct map **maps,size_t perf_session__fprintf_dsos (struct perf_session *self,FILE *fp) { -return __dsos__fprintf (&self->host_machine.kernel_dsos, fp) + -__dsos__fprintf (&self->host_machine.user_dsos, fp) + -machines__fprintf_dsos (&self->machines, fp); +return machines__fprintf_dsos (&self->machines, fp); }size_t perf_session__fprintf_dsos_buildid (struct perf_session *self,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm) { -size_t ret =machine__fprintf_dsos_buildid (&self->host_machine, fp, skip, parm); -return ret +machines__fprintf_dsos_buildid (&self->machines, fp, skip, parm); +return machines__fprintf_dsos_buildid (&self->machines, fp, skip, parm); }size_t perf_session__fprintf_nr_events (struct perf_session *session,FILE *fp)
@@ -1368,7 +1362,7 @@ size_t perf_session__fprintf(struct perf_session *session, FILE *fp)* FIXME: Here we have to actually print all the machines in this * session, not just the host... */ -return machine__fprintf (&session->host_machine, fp); +return machine__fprintf (&session->machines.host, fp); } void perf_session__remove_thread(struct perf_session *session,
@@ -1377,10 +1371,10 @@ void perf_session__remove_thread(struct perf_session *session,/* * FIXME: This one makes no sense, we need to remove the thread from * the machine it belongs to, perf_session can have many machines, so -* doing it always on ->host_machine is wrong. Fix when auditing all +* doing it always on ->machines.host is wrong. Fix when auditing all * the 'perf kvm' code. */ -machine__remove_thread (&session->host_machine, th); +machine__remove_thread (&session->machines.host, th); } struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
tools/perf/util/session.h +3 -8
@@ -30,8 +30,7 @@ struct ordered_samples {struct perf_session {struct perf_header header;unsigned long size; -struct machine host_machine; -struct rb_root machines; +struct machines machines;struct perf_evlist *evlist;struct pevent *pevent;struct events_stats stats;
@@ -49,7 +48,7 @@ struct perf_tool;struct perf_session *perf_session__new (const char *filename,int mode,bool force,bool repipe,struct perf_tool *tool); -void perf_session__delete (struct perf_session *self); +void perf_session__delete (struct perf_session *session);void perf_event_header__bswap (struct perf_event_header *self);
@@ -78,22 +77,18 @@ void perf_session__remove_thread(struct perf_session *self, struct thread *th);static inline struct machine *perf_session__find_host_machine (struct perf_session *self) { -return &self->host_machine; +return &self->machines.host; }static inline struct machine *perf_session__find_machine (struct perf_session *self,pid_t pid) { -if (pid ==HOST_KERNEL_ID ) -return &self->host_machine;return machines__find (&self->machines, pid); }static inline struct machine *perf_session__findnew_machine (struct perf_session *self,pid_t pid) { -if (pid ==HOST_KERNEL_ID ) -return &self->host_machine;return machines__findnew (&self->machines, pid); }