lkml.org 
[lkml]   [2019]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: perf/core] libperf: Add PERF_RECORD_AUXTRACE 'struct auxtrace_event' to perf/event.h
    The following commit has been merged into the perf/core branch of tip:

    Commit-ID: 306c9d24c09d84d80ae54b36f7f907c8b8fa537a
    Gitweb: https://git.kernel.org/tip/306c9d24c09d84d80ae54b36f7f907c8b8fa537a
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Wed, 28 Aug 2019 15:57:03 +02:00
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitterDate: Thu, 29 Aug 2019 08:36:11 -03:00

    libperf: Add PERF_RECORD_AUXTRACE 'struct auxtrace_event' to perf/event.h

    Move the PERF_RECORD_AUXTRACE event definition to libperf's event.h.

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

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Michael Petlan <mpetlan@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/20190828135717.7245-10-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/lib/include/perf/event.h | 11 +++++++++++
    tools/perf/util/auxtrace.c | 2 +-
    tools/perf/util/event.h | 11 -----------
    3 files changed, 12 insertions(+), 12 deletions(-)

    diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
    index 02da734..78001c2 100644
    --- a/tools/perf/lib/include/perf/event.h
    +++ b/tools/perf/lib/include/perf/event.h
    @@ -208,4 +208,15 @@ struct auxtrace_info_event {
    __u64 priv[];
    };

    +struct auxtrace_event {
    + struct perf_event_header header;
    + __u64 size;
    + __u64 offset;
    + __u64 reference;
    + __u32 idx;
    + __u32 tid;
    + __u32 cpu;
    + __u32 reserved__; /* For alignment */
    +};
    +
    #endif /* __LIBPERF_EVENT_H */
    diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
    index 112c24a..5edec71 100644
    --- a/tools/perf/util/auxtrace.c
    +++ b/tools/perf/util/auxtrace.c
    @@ -943,7 +943,7 @@ s64 perf_event__process_auxtrace(struct perf_session *session,
    s64 err;

    if (dump_trace)
    - fprintf(stdout, " size: %#"PRIx64" offset: %#"PRIx64" ref: %#"PRIx64" idx: %u tid: %d cpu: %d\n",
    + fprintf(stdout, " size: %#"PRI_lx64" offset: %#"PRI_lx64" ref: %#"PRI_lx64" idx: %u tid: %d cpu: %d\n",
    event->auxtrace.size, event->auxtrace.offset,
    event->auxtrace.reference, event->auxtrace.idx,
    event->auxtrace.tid, event->auxtrace.cpu);
    diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
    index ca2cae3..60895a3 100644
    --- a/tools/perf/util/event.h
    +++ b/tools/perf/util/event.h
    @@ -332,17 +332,6 @@ struct events_stats {
    u32 nr_proc_map_timeout;
    };

    -struct auxtrace_event {
    - struct perf_event_header header;
    - u64 size;
    - u64 offset;
    - u64 reference;
    - u32 idx;
    - u32 tid;
    - u32 cpu;
    - u32 reserved__; /* For alignment */
    -};
    -
    #define MAX_AUXTRACE_ERROR_MSG 64

    struct auxtrace_error_event {
    \
     
     \ /
      Last update: 2019-08-29 21:04    [W:4.192 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site