lkml.org 
[lkml]   [2019]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 perf,bpf 05/15] perf: change prototype of perf_event__synthesize_bpf_events()
    Date
    This patch changes the arguments of perf_event__synthesize_bpf_events()
    to include perf_session* instead of perf_tool*. perf_session will be used
    in the next patch.

    Signed-off-by: Song Liu <songliubraving@fb.com>
    ---
    tools/perf/builtin-record.c | 2 +-
    tools/perf/builtin-top.c | 2 +-
    tools/perf/util/bpf-event.c | 8 +++++---
    tools/perf/util/bpf-event.h | 4 ++--
    4 files changed, 9 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index 88ea11d57c6f..2355e0a9eda0 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -1083,7 +1083,7 @@ static int record__synthesize(struct record *rec, bool tail)
    return err;
    }

    - err = perf_event__synthesize_bpf_events(tool, process_synthesized_event,
    + err = perf_event__synthesize_bpf_events(session, process_synthesized_event,
    machine, opts);
    if (err < 0)
    pr_warning("Couldn't synthesize bpf events.\n");
    diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
    index 5a486d4de56e..27d8d42e0a4d 100644
    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -1216,7 +1216,7 @@ static int __cmd_top(struct perf_top *top)

    init_process_thread(top);

    - ret = perf_event__synthesize_bpf_events(&top->tool, perf_event__process,
    + ret = perf_event__synthesize_bpf_events(top->session, perf_event__process,
    &top->session->machines.host,
    &top->record_opts);
    if (ret < 0)
    diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
    index e6dfb95029e5..ff7ee149ec46 100644
    --- a/tools/perf/util/bpf-event.c
    +++ b/tools/perf/util/bpf-event.c
    @@ -10,6 +10,7 @@
    #include "debug.h"
    #include "symbol.h"
    #include "machine.h"
    +#include "session.h"

    #define ptr_to_u64(ptr) ((__u64)(unsigned long)(ptr))

    @@ -42,7 +43,7 @@ int machine__process_bpf_event(struct machine *machine __maybe_unused,
    * -1 for failures;
    * -2 for lack of kernel support.
    */
    -static int perf_event__synthesize_one_bpf_prog(struct perf_tool *tool,
    +static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
    perf_event__handler_t process,
    struct machine *machine,
    int fd,
    @@ -52,6 +53,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_tool *tool,
    struct ksymbol_event *ksymbol_event = &event->ksymbol_event;
    struct bpf_event *bpf_event = &event->bpf_event;
    struct bpf_prog_info_linear *info_linear;
    + struct perf_tool *tool = session->tool;
    struct bpf_prog_info *info;
    struct btf *btf = NULL;
    bool has_btf = false;
    @@ -175,7 +177,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_tool *tool,
    return err ? -1 : 0;
    }

    -int perf_event__synthesize_bpf_events(struct perf_tool *tool,
    +int perf_event__synthesize_bpf_events(struct perf_session *session,
    perf_event__handler_t process,
    struct machine *machine,
    struct record_opts *opts)
    @@ -209,7 +211,7 @@ int perf_event__synthesize_bpf_events(struct perf_tool *tool,
    continue;
    }

    - err = perf_event__synthesize_one_bpf_prog(tool, process,
    + err = perf_event__synthesize_one_bpf_prog(session, process,
    machine, fd,
    event, opts);
    close(fd);
    diff --git a/tools/perf/util/bpf-event.h b/tools/perf/util/bpf-event.h
    index 7890067e1a37..6698683612a7 100644
    --- a/tools/perf/util/bpf-event.h
    +++ b/tools/perf/util/bpf-event.h
    @@ -15,7 +15,7 @@ struct record_opts;
    int machine__process_bpf_event(struct machine *machine, union perf_event *event,
    struct perf_sample *sample);

    -int perf_event__synthesize_bpf_events(struct perf_tool *tool,
    +int perf_event__synthesize_bpf_events(struct perf_session *session,
    perf_event__handler_t process,
    struct machine *machine,
    struct record_opts *opts);
    @@ -27,7 +27,7 @@ static inline int machine__process_bpf_event(struct machine *machine __maybe_unu
    return 0;
    }

    -static inline int perf_event__synthesize_bpf_events(struct perf_tool *tool __maybe_unused,
    +static inline int perf_event__synthesize_bpf_events(struct perf_session *session __maybe_unused,
    perf_event__handler_t process __maybe_unused,
    struct machine *machine __maybe_unused,
    struct record_opts *opts __maybe_unused)
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-02-26 01:21    [W:4.536 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site