perf machine: Simplify accessing the host machine
Commit-ID: 34ba5122bf198c9cdfcbecc9b23eaa414244a3f6 Gitweb: http://git.kernel.org/tip/34ba5122bf198c9cdfcbecc9b23eaa414244a3f6 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 19 Dec 2012 09:04:24 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 24 Jan 2013 16:40:13 -0300
perf machine: Simplify accessing the host machine
It is always there, no sense in calling a function named "perf_session__find_host_machine".
Also no sense in checking if that function return is NULL, so ditch needless error handling.
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-kmem.c | 7 +------ tools/perf/builtin-record.c | 7 +------ tools/perf/builtin-top.c | 4 ++-- tools/perf/util/session.c | 2 +- tools/perf/util/session.h | 6 ------ 5 files changed, 5 insertions(+), 21 deletions(-)
tools/perf/builtin-kmem.c +1 -6
@@ -340,7 +340,7 @@ static void __print_result(struct rb_root *root, struct perf_session *session, int n_lines, int is_caller) {struct rb_node *next; -struct machine *machine; +struct machine *machine = &session->machines.host;printf ("%.102s\n" , graph_dotted_line);printf (" %-34s |" , is_caller ?"Callsite" :"Alloc Ptr" );
@@ -349,11 +349,6 @@ static void __print_result(struct rb_root *root, struct perf_session *session, next =rb_first (root); - machine =perf_session__find_host_machine (session); -if (!machine) { -pr_err ("__print_result: couldn't find kernel information\n" ); -return ; - }while (next && n_lines--) { struct alloc_stat *data = rb_entry(next, struct alloc_stat, node);
tools/perf/builtin-record.c +1 -6
@@ -512,12 +512,7 @@ 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" ); - err =-1 ; - goto out_delete_session; - } + machine = &session->machines.host;if (opts->pipe_output) { err = perf_event__synthesize_attrs(tool, session,
tools/perf/builtin-top.c +2 -2
@@ -847,13 +847,13 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) ++top->us_samples;if (top->hide_user_symbols)continue ; - machine =perf_session__find_host_machine (session); + machine = &session->machines.host;break ;case PERF_RECORD_MISC_KERNEL : ++top->kernel_samples;if (top->hide_kernel_symbols)continue ; - machine =perf_session__find_host_machine (session); + machine = &session->machines.host;break ;case PERF_RECORD_MISC_GUEST_KERNEL : ++top->guest_kernel_samples;
tools/perf/util/session.c +1 -1
@@ -821,7 +821,7 @@ static struct machine *return perf_session__findnew_machine (session, pid); } -return perf_session__find_host_machine (session); +return &session->machines.host; } static int perf_session_deliver_event(struct perf_session *session,
tools/perf/util/session.h +0 -6
@@ -75,12 +75,6 @@ void perf_session__set_id_hdr_size(struct perf_session *session);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->machines.host; -} - -static inline struct machine *perf_session__find_machine (struct perf_session *self,pid_t pid) {return machines__find (&self->machines, pid);