lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 2/8] perf session: Simplify tool stubs
    Date
    Some of the stubs are identical so just have one function
    for them.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---

    Changes in V2:

    Fixed "From" and "Signed-off-by" email addresses

    tools/perf/util/session.c | 40 +++++++---------------------------------
    1 file changed, 7 insertions(+), 33 deletions(-)

    diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
    index 40b7a0d0905b..60b3593d210d 100644
    --- a/tools/perf/util/session.c
    +++ b/tools/perf/util/session.c
    @@ -240,14 +240,6 @@ static int process_event_stub(struct perf_tool *tool __maybe_unused,
    return 0;
    }

    -static int process_build_id_stub(struct perf_tool *tool __maybe_unused,
    - union perf_event *event __maybe_unused,
    - struct perf_session *session __maybe_unused)
    -{
    - dump_printf(": unhandled!\n");
    - return 0;
    -}
    -
    static int process_finished_round_stub(struct perf_tool *tool __maybe_unused,
    union perf_event *event __maybe_unused,
    struct ordered_events *oe __maybe_unused)
    @@ -260,23 +252,6 @@ static int process_finished_round(struct perf_tool *tool,
    union perf_event *event,
    struct ordered_events *oe);

    -static int process_id_index_stub(struct perf_tool *tool __maybe_unused,
    - union perf_event *event __maybe_unused,
    - struct perf_session *perf_session
    - __maybe_unused)
    -{
    - dump_printf(": unhandled!\n");
    - return 0;
    -}
    -
    -static int process_event_auxtrace_info_stub(struct perf_tool *tool __maybe_unused,
    - union perf_event *event __maybe_unused,
    - struct perf_session *session __maybe_unused)
    -{
    - dump_printf(": unhandled!\n");
    - return 0;
    -}
    -
    static int skipn(int fd, off_t n)
    {
    char buf[4096];
    @@ -303,10 +278,9 @@ static s64 process_event_auxtrace_stub(struct perf_tool *tool __maybe_unused,
    return event->auxtrace.size;
    }

    -static
    -int process_event_auxtrace_error_stub(struct perf_tool *tool __maybe_unused,
    - union perf_event *event __maybe_unused,
    - struct perf_session *session __maybe_unused)
    +static int process_event_op2_stub(struct perf_tool *tool __maybe_unused,
    + union perf_event *event __maybe_unused,
    + struct perf_session *session __maybe_unused)
    {
    dump_printf(": unhandled!\n");
    return 0;
    @@ -410,7 +384,7 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
    if (tool->tracing_data == NULL)
    tool->tracing_data = process_event_synth_tracing_data_stub;
    if (tool->build_id == NULL)
    - tool->build_id = process_build_id_stub;
    + tool->build_id = process_event_op2_stub;
    if (tool->finished_round == NULL) {
    if (tool->ordered_events)
    tool->finished_round = process_finished_round;
    @@ -418,13 +392,13 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
    tool->finished_round = process_finished_round_stub;
    }
    if (tool->id_index == NULL)
    - tool->id_index = process_id_index_stub;
    + tool->id_index = process_event_op2_stub;
    if (tool->auxtrace_info == NULL)
    - tool->auxtrace_info = process_event_auxtrace_info_stub;
    + tool->auxtrace_info = process_event_op2_stub;
    if (tool->auxtrace == NULL)
    tool->auxtrace = process_event_auxtrace_stub;
    if (tool->auxtrace_error == NULL)
    - tool->auxtrace_error = process_event_auxtrace_error_stub;
    + tool->auxtrace_error = process_event_op2_stub;
    if (tool->thread_map == NULL)
    tool->thread_map = process_event_thread_map_stub;
    if (tool->cpu_map == NULL)
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-03-08 10:21    [W:4.160 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site