Commit 5290ed69 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

libperf: Add PERF_RECORD_LOST 'struct lost_event' to perf/event.h

Move the lost_event event definition to 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: default avatarJiri 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-7-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bceb59b1
...@@ -2643,7 +2643,7 @@ static int process_lost(struct perf_tool *tool __maybe_unused, ...@@ -2643,7 +2643,7 @@ static int process_lost(struct perf_tool *tool __maybe_unused,
timestamp__scnprintf_usec(sample->time, tstr, sizeof(tstr)); timestamp__scnprintf_usec(sample->time, tstr, sizeof(tstr));
printf("%15s ", tstr); printf("%15s ", tstr);
printf("lost %" PRIu64 " events on cpu %d\n", event->lost.lost, sample->cpu); printf("lost %" PRI_lu64 " events on cpu %d\n", event->lost.lost, sample->cpu);
return 0; return 0;
} }
......
...@@ -50,4 +50,10 @@ struct fork_event { ...@@ -50,4 +50,10 @@ struct fork_event {
__u64 time; __u64 time;
}; };
struct lost_event {
struct perf_event_header header;
__u64 id;
__u64 lost;
};
#endif /* __LIBPERF_EVENT_H */ #endif /* __LIBPERF_EVENT_H */
...@@ -1480,7 +1480,7 @@ size_t perf_event__fprintf_switch(union perf_event *event, FILE *fp) ...@@ -1480,7 +1480,7 @@ size_t perf_event__fprintf_switch(union perf_event *event, FILE *fp)
static size_t perf_event__fprintf_lost(union perf_event *event, FILE *fp) static size_t perf_event__fprintf_lost(union perf_event *event, FILE *fp)
{ {
return fprintf(fp, " lost %" PRIu64 "\n", event->lost.lost); return fprintf(fp, " lost %" PRI_lu64 "\n", event->lost.lost);
} }
size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp) size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp)
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
#define PRI_lx64 PRIx64 #define PRI_lx64 PRIx64
#endif #endif
struct lost_event {
struct perf_event_header header;
u64 id;
u64 lost;
};
struct lost_samples_event { struct lost_samples_event {
struct perf_event_header header; struct perf_event_header header;
u64 lost; u64 lost;
......
...@@ -645,7 +645,7 @@ int machine__process_namespaces_event(struct machine *machine __maybe_unused, ...@@ -645,7 +645,7 @@ int machine__process_namespaces_event(struct machine *machine __maybe_unused,
int machine__process_lost_event(struct machine *machine __maybe_unused, int machine__process_lost_event(struct machine *machine __maybe_unused,
union perf_event *event, struct perf_sample *sample __maybe_unused) union perf_event *event, struct perf_sample *sample __maybe_unused)
{ {
dump_printf(": id:%" PRIu64 ": lost:%" PRIu64 "\n", dump_printf(": id:%" PRI_lu64 ": lost:%" PRI_lu64 "\n",
event->lost.id, event->lost.lost); event->lost.id, event->lost.lost);
return 0; return 0;
} }
......
...@@ -263,8 +263,8 @@ static PyObject *pyrf_lost_event__repr(struct pyrf_event *pevent) ...@@ -263,8 +263,8 @@ static PyObject *pyrf_lost_event__repr(struct pyrf_event *pevent)
PyObject *ret; PyObject *ret;
char *s; char *s;
if (asprintf(&s, "{ type: lost, id: %#" PRIx64 ", " if (asprintf(&s, "{ type: lost, id: %#" PRI_lx64 ", "
"lost: %#" PRIx64 " }", "lost: %#" PRI_lx64 " }",
pevent->event.lost.id, pevent->event.lost.lost) < 0) { pevent->event.lost.id, pevent->event.lost.lost) < 0) {
ret = PyErr_NoMemory(); ret = PyErr_NoMemory();
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment