lkml.org 
[lkml]   [2019]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/23] libperf: Add PERF_RECORD_AUX 'struct aux_event' to perf/event.h
    Date
    Move the PERF_RECORD_AUX event definition to libperf's event.h.

    In order to keep libperf simple, we switch 'u64/u32/u16/u8'
    types used events to their generic '__u*' versions.

    Link: http://lkml.kernel.org/n/tip-u8n9stb8xl6hq0qoqjegoiyi@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/lib/include/perf/event.h | 7 +++++++
    tools/perf/util/event.c | 2 +-
    tools/perf/util/event.h | 7 -------
    3 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
    index 6292b7c41bac..d453ac833a58 100644
    --- a/tools/perf/lib/include/perf/event.h
    +++ b/tools/perf/lib/include/perf/event.h
    @@ -234,4 +234,11 @@ struct auxtrace_error_event {
    char msg[MAX_AUXTRACE_ERROR_MSG];
    };

    +struct aux_event {
    + struct perf_event_header header;
    + __u64 aux_offset;
    + __u64 aux_size;
    + __u64 flags;
    +};
    +
    #endif /* __LIBPERF_EVENT_H */
    diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
    index 33616ea62a47..85f9f27782b1 100644
    --- a/tools/perf/util/event.c
    +++ b/tools/perf/util/event.c
    @@ -1448,7 +1448,7 @@ int perf_event__process_exit(struct perf_tool *tool __maybe_unused,

    size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp)
    {
    - return fprintf(fp, " offset: %#"PRIx64" size: %#"PRIx64" flags: %#"PRIx64" [%s%s%s]\n",
    + return fprintf(fp, " offset: %#"PRI_lx64" size: %#"PRI_lx64" flags: %#"PRI_lx64" [%s%s%s]\n",
    event->aux.aux_offset, event->aux.aux_size,
    event->aux.flags,
    event->aux.flags & PERF_AUX_FLAG_TRUNCATED ? "T" : "",
    diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
    index e334ecbe50a0..db901aea33af 100644
    --- a/tools/perf/util/event.h
    +++ b/tools/perf/util/event.h
    @@ -332,13 +332,6 @@ struct events_stats {
    u32 nr_proc_map_timeout;
    };

    -struct aux_event {
    - struct perf_event_header header;
    - u64 aux_offset;
    - u64 aux_size;
    - u64 flags;
    -};
    -
    struct itrace_start_event {
    struct perf_event_header header;
    u32 pid, tid;
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-08-28 15:59    [W:2.451 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site