Skip to content

Commit

Permalink
libperf: Add PERF_RECORD_FORK 'struct fork_event' to perf/event.h
Browse files Browse the repository at this point in the history
Move the fork_event 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.  Using 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-6-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 19d1765 commit bceb59b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
7 changes: 7 additions & 0 deletions tools/perf/lib/include/perf/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,11 @@ struct namespaces_event {
struct perf_ns_link_info link_info[];
};

struct fork_event {
struct perf_event_header header;
__u32 pid, ppid;
__u32 tid, ptid;
__u64 time;
};

#endif /* __LIBPERF_EVENT_H */
7 changes: 0 additions & 7 deletions tools/perf/util/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
#define PRI_lx64 PRIx64
#endif

struct fork_event {
struct perf_event_header header;
u32 pid, ppid;
u32 tid, ptid;
u64 time;
};

struct lost_event {
struct perf_event_header header;
u64 id;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/python.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static PyMemberDef pyrf_task_event__members[] = {
static PyObject *pyrf_task_event__repr(struct pyrf_event *pevent)
{
return _PyUnicode_FromFormat("{ type: %s, pid: %u, ppid: %u, tid: %u, "
"ptid: %u, time: %" PRIu64 "}",
"ptid: %u, time: %" PRI_lu64 "}",
pevent->event.header.type == PERF_RECORD_FORK ? "fork" : "exit",
pevent->event.fork.pid,
pevent->event.fork.ppid,
Expand Down

0 comments on commit bceb59b

Please sign in to comment.