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>
This commit is contained in:
Родитель
09ecbb07a5
Коммит
34ba5122bf
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -74,12 +74,6 @@ int perf_session__create_kernel_maps(struct perf_session *self);
|
|||
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)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче