lkml.org 
[lkml]   [2015]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/56] perf tools: Add stat config event
    Date
    Adding stat config event to pass/store stat config data,
    so report tools (report/script) know how to interpret
    stat data.

    The config data are stored in 'tag|value' way to allow
    easy extension and backward compatibility.

    Link: http://lkml.kernel.org/n/tip-1npdsfez8635vogthpqwtkd0@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/util/event.c | 1 +
    tools/perf/util/event.h | 20 ++++++++++++++++++++
    tools/perf/util/session.c | 24 ++++++++++++++++++++++++
    tools/perf/util/tool.h | 3 ++-
    4 files changed, 47 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
    index d55e5a5ca757..35a678c06b7b 100644
    --- a/tools/perf/util/event.c
    +++ b/tools/perf/util/event.c
    @@ -39,6 +39,7 @@ static const char *perf_event__names[] = {
    [PERF_RECORD_AUXTRACE_ERROR] = "AUXTRACE_ERROR",
    [PERF_RECORD_THREAD_MAP] = "THREAD_MAP",
    [PERF_RECORD_CPU_MAP] = "CPU_MAP",
    + [PERF_RECORD_STAT_CONFIG] = "STAT_CONFIG",
    };

    const char *perf_event__name(unsigned int id)
    diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
    index 8e4fe4ea7704..ce8462255631 100644
    --- a/tools/perf/util/event.h
    +++ b/tools/perf/util/event.h
    @@ -228,6 +228,7 @@ enum perf_user_event_type { /* above any possible kernel type */
    PERF_RECORD_AUXTRACE_ERROR = 72,
    PERF_RECORD_THREAD_MAP = 73,
    PERF_RECORD_CPU_MAP = 74,
    + PERF_RECORD_STAT_CONFIG = 75,
    PERF_RECORD_HEADER_MAX
    };

    @@ -375,6 +376,24 @@ struct cpu_map_event {
    u64 cpu[];
    };

    +enum {
    + PERF_STAT_CONFIG_TERM__AGGR_MODE = 0,
    + PERF_STAT_CONFIG_TERM__INTERVAL = 1,
    + PERF_STAT_CONFIG_TERM__SCALE = 2,
    + PERF_STAT_CONFIG_TERM__MAX = 3,
    +};
    +
    +struct stat_config_term_event {
    + u64 tag;
    + u64 val;
    +};
    +
    +struct stat_config_event {
    + struct perf_event_header header;
    + u64 nr;
    + struct stat_config_term_event data[];
    +};
    +
    union perf_event {
    struct perf_event_header header;
    struct mmap_event mmap;
    @@ -399,6 +418,7 @@ union perf_event {
    struct context_switch_event context_switch;
    struct thread_map_event thread_map;
    struct cpu_map_event cpu_map;
    + struct stat_config_event stat_config;
    };

    void perf_event__print_totals(void);
    diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
    index 735ecf84f977..150ddc14b3fd 100644
    --- a/tools/perf/util/session.c
    +++ b/tools/perf/util/session.c
    @@ -315,6 +315,15 @@ int process_event_cpu_map_stub(struct perf_tool *tool __maybe_unused,
    return 0;
    }

    +static
    +int process_event_stat_config_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;
    +}
    +
    void perf_tool__fill_defaults(struct perf_tool *tool)
    {
    if (tool->sample == NULL)
    @@ -369,6 +378,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
    tool->thread_map = process_event_thread_map_stub;
    if (tool->cpu_map == NULL)
    tool->cpu_map = process_event_cpu_map_stub;
    + if (tool->stat_config == NULL)
    + tool->stat_config = process_event_stat_config_stub;
    }

    static void swap_sample_id_all(union perf_event *event, void *data)
    @@ -661,6 +672,16 @@ static void perf_event__cpu_map_swap(union perf_event *event,
    event->cpu_map.cpu[i] = bswap_64(event->cpu_map.cpu[i]);
    }

    +static void perf_event__stat_config_swap(union perf_event *event,
    + bool sample_id_all __maybe_unused)
    +{
    + u64 size;
    +
    + size = event->stat_config.nr * sizeof(event->stat_config.data[0]);
    + size += 1; /* nr item itself */
    + mem_bswap_64(&event->stat_config.nr, size);
    +}
    +
    typedef void (*perf_event__swap_op)(union perf_event *event,
    bool sample_id_all);

    @@ -690,6 +711,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
    [PERF_RECORD_AUXTRACE_ERROR] = perf_event__auxtrace_error_swap,
    [PERF_RECORD_THREAD_MAP] = perf_event__thread_map_swap,
    [PERF_RECORD_CPU_MAP] = perf_event__cpu_map_swap,
    + [PERF_RECORD_STAT_CONFIG] = perf_event__stat_config_swap,
    [PERF_RECORD_HEADER_MAX] = NULL,
    };

    @@ -1230,6 +1252,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,
    return tool->thread_map(tool, event, session);
    case PERF_RECORD_CPU_MAP:
    return tool->cpu_map(tool, event, session);
    + case PERF_RECORD_STAT_CONFIG:
    + return tool->stat_config(tool, event, session);
    default:
    return -EINVAL;
    }
    diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
    index 9e5925c78519..aa7ae73d76b4 100644
    --- a/tools/perf/util/tool.h
    +++ b/tools/perf/util/tool.h
    @@ -57,7 +57,8 @@ struct perf_tool {
    auxtrace_info,
    auxtrace_error,
    thread_map,
    - cpu_map;
    + cpu_map,
    + stat_config;
    event_op3 auxtrace;
    bool ordered_events;
    bool ordering_requires_timestamps;
    --
    2.4.3


    \
     
     \ /
      Last update: 2015-10-06 22:21    [W:4.073 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site