Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 34ba5122bf198c9cdfcbecc9b23eaa414244a3f6

Authored by Arnaldo Carvalho de Melo
1 parent 09ecbb07a5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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 <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-a6a3zx3afbrxo8p2zqm5mxo8@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 5 changed files with 5 additions and 21 deletions Side-by-side Diff

tools/perf/builtin-kmem.c
Diff comments   View file @ 34ba512
... ... @@ -340,7 +340,7 @@
340 340 int n_lines, int is_caller)
341 341 {
342 342 struct rb_node *next;
343   - struct machine *machine;
  343 + struct machine *machine = &session->machines.host;
344 344  
345 345 printf("%.102s\n", graph_dotted_line);
346 346 printf(" %-34s |", is_caller ? "Callsite": "Alloc Ptr");
... ... @@ -349,11 +349,6 @@
349 349  
350 350 next = rb_first(root);
351 351  
352   - machine = perf_session__find_host_machine(session);
353   - if (!machine) {
354   - pr_err("__print_result: couldn't find kernel information\n");
355   - return;
356   - }
357 352 while (next && n_lines--) {
358 353 struct alloc_stat *data = rb_entry(next, struct alloc_stat,
359 354 node);
tools/perf/builtin-record.c
Diff comments   View file @ 34ba512
... ... @@ -512,12 +512,7 @@
512 512  
513 513 rec->post_processing_offset = lseek(output, 0, SEEK_CUR);
514 514  
515   - machine = perf_session__find_host_machine(session);
516   - if (!machine) {
517   - pr_err("Couldn't find native kernel information.\n");
518   - err = -1;
519   - goto out_delete_session;
520   - }
  515 + machine = &session->machines.host;
521 516  
522 517 if (opts->pipe_output) {
523 518 err = perf_event__synthesize_attrs(tool, session,
tools/perf/builtin-top.c
Diff comments   View file @ 34ba512
... ... @@ -847,13 +847,13 @@
847 847 ++top->us_samples;
848 848 if (top->hide_user_symbols)
849 849 continue;
850   - machine = perf_session__find_host_machine(session);
  850 + machine = &session->machines.host;
851 851 break;
852 852 case PERF_RECORD_MISC_KERNEL:
853 853 ++top->kernel_samples;
854 854 if (top->hide_kernel_symbols)
855 855 continue;
856   - machine = perf_session__find_host_machine(session);
  856 + machine = &session->machines.host;
857 857 break;
858 858 case PERF_RECORD_MISC_GUEST_KERNEL:
859 859 ++top->guest_kernel_samples;
tools/perf/util/session.c
Diff comments   View file @ 34ba512
... ... @@ -821,7 +821,7 @@
821 821 return perf_session__findnew_machine(session, pid);
822 822 }
823 823  
824   - return perf_session__find_host_machine(session);
  824 + return &session->machines.host;
825 825 }
826 826  
827 827 static int perf_session_deliver_event(struct perf_session *session,
tools/perf/util/session.h
Diff comments   View file @ 34ba512
... ... @@ -75,12 +75,6 @@
75 75 void perf_session__remove_thread(struct perf_session *self, struct thread *th);
76 76  
77 77 static inline
78   -struct machine *perf_session__find_host_machine(struct perf_session *self)
79   -{
80   - return &self->machines.host;
81   -}
82   -
83   -static inline
84 78 struct machine *perf_session__find_machine(struct perf_session *self, pid_t pid)
85 79 {
86 80 return machines__find(&self->machines, pid);