Skip to content

Commit

Permalink
libperf: Add PERF_RECORD_KSYMBOL 'struct ksymbol_event' to perf/event.h
Browse files Browse the repository at this point in the history
Move the PERF_RECORD_KSYMBOL event definition into libperf's event.h
header include.

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

Perf added 'u*' types mainly to ease up printing __u64 values
as stated in the linux/types.h comment:

  /*
   * We define u64 as uint64_t for every architecture
   * so that we can print it with "%"PRIx64 without getting warnings.
   *
   * typedef __u64 u64;
   * typedef __s64 s64;
   */

Add and use new PRI_lu64 and PRI_lx64 macros for that.  Use extra '_' to
ease up the reading and differentiate them from standard PRI*64 macros.

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/20190825181752.722-11-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Aug 26, 2019
1 parent 003c66f commit f15e3c2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
13 changes: 13 additions & 0 deletions tools/perf/lib/include/perf/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,17 @@ struct throttle_event {
__u64 stream_id;
};

#ifndef KSYM_NAME_LEN
#define KSYM_NAME_LEN 256
#endif

struct ksymbol_event {
struct perf_event_header header;
__u64 addr;
__u32 len;
__u16 ksym_type;
__u16 flags;
char name[KSYM_NAME_LEN];
};

#endif /* __LIBPERF_EVENT_H */
2 changes: 1 addition & 1 deletion tools/perf/util/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ static size_t perf_event__fprintf_lost(union perf_event *event, FILE *fp)

size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp)
{
return fprintf(fp, " addr %" PRIx64 " len %u type %u flags 0x%x name %s\n",
return fprintf(fp, " addr %" PRI_lx64 " len %u type %u flags 0x%x name %s\n",
event->ksymbol_event.addr, event->ksymbol_event.len,
event->ksymbol_event.ksym_type,
event->ksymbol_event.flags, event->ksymbol_event.name);
Expand Down
13 changes: 0 additions & 13 deletions tools/perf/util/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,6 @@
#define PRI_lx64 PRIx64
#endif

#ifndef KSYM_NAME_LEN
#define KSYM_NAME_LEN 256
#endif

struct ksymbol_event {
struct perf_event_header header;
u64 addr;
u32 len;
u16 ksym_type;
u16 flags;
char name[KSYM_NAME_LEN];
};

struct bpf_event {
struct perf_event_header header;
u16 type;
Expand Down

0 comments on commit f15e3c2

Please sign in to comment.