From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Michael Petlan <mpetlan@redhat.com>
Subject: [PATCH 07/23] libperf: Add PERF_RECORD_ID_INDEX 'struct id_index_event' to perf/event.h
Date: Wed, 28 Aug 2019 15:57:01 +0200 [thread overview]
Message-ID: <20190828135717.7245-8-jolsa@kernel.org> (raw)
In-Reply-To: <20190828135717.7245-1-jolsa@kernel.org>
Move the PERF_RECORD_ID_INDEX 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.
Adding PRI_ld64 define, so we can use it in printf output.
Link: http://lkml.kernel.org/n/tip-rfqlci30hjrzropnxjnwoz12@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/lib/include/perf/event.h | 13 +++++++++++++
tools/perf/util/event.h | 15 ++-------------
tools/perf/util/session.c | 8 ++++----
3 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index 5e6b6d16793c..c68523c4fa01 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -188,4 +188,17 @@ struct build_id_event {
char filename[];
};
+struct id_index_entry {
+ __u64 id;
+ __u64 idx;
+ __u64 cpu;
+ __u64 tid;
+};
+
+struct id_index_event {
+ struct perf_event_header header;
+ __u64 nr;
+ struct id_index_entry entries[0];
+};
+
#endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 4b6cf89f31db..82315d2845fe 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -22,9 +22,11 @@
*/
#define PRI_lu64 "l" PRIu64
#define PRI_lx64 "l" PRIx64
+#define PRI_ld64 "l" PRId64
#else
#define PRI_lu64 PRIu64
#define PRI_lx64 PRIx64
+#define PRI_ld64 PRId64
#endif
#define PERF_SAMPLE_MASK \
@@ -330,19 +332,6 @@ struct events_stats {
u32 nr_proc_map_timeout;
};
-struct id_index_entry {
- u64 id;
- u64 idx;
- u64 cpu;
- u64 tid;
-};
-
-struct id_index_event {
- struct perf_event_header header;
- u64 nr;
- struct id_index_entry entries[0];
-};
-
struct auxtrace_info_event {
struct perf_event_header header;
u32 type;
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 5786e9c807c5..daa8aed27eae 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2392,10 +2392,10 @@ int perf_event__process_id_index(struct perf_session *session,
struct perf_sample_id *sid;
if (dump_trace) {
- fprintf(stdout, " ... id: %"PRIu64, e->id);
- fprintf(stdout, " idx: %"PRIu64, e->idx);
- fprintf(stdout, " cpu: %"PRId64, e->cpu);
- fprintf(stdout, " tid: %"PRId64"\n", e->tid);
+ fprintf(stdout, " ... id: %"PRI_lu64, e->id);
+ fprintf(stdout, " idx: %"PRI_lu64, e->idx);
+ fprintf(stdout, " cpu: %"PRI_ld64, e->cpu);
+ fprintf(stdout, " tid: %"PRI_ld64"\n", e->tid);
}
sid = perf_evlist__id2sid(evlist, e->id);
--
2.21.0
next prev parent reply other threads:[~2019-08-28 13:58 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 13:56 [PATCH 00/23] libperf: Add rest of events to perf/event.h Jiri Olsa
2019-08-28 13:56 ` [PATCH 01/23] libperf: Add PERF_RECORD_HEADER_ATTR 'struct attr_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 02/23] libperf: Add PERF_RECORD_CPU_MAP 'struct cpu_map_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 03/23] libperf: Add PERF_RECORD_EVENT_UPDATE 'struct event_update_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 04/23] libperf: Add PERF_RECORD_HEADER_EVENT_TYPE 'struct event_type_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:56 ` [PATCH 05/23] libperf: Add PERF_RECORD_HEADER_TRACING_DATA 'struct tracing_data_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 06/23] libperf: Add PERF_RECORD_HEADER_BUILD_ID 'struct build_id_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` Jiri Olsa [this message]
2019-08-29 19:01 ` [tip: perf/core] libperf: Add PERF_RECORD_ID_INDEX 'struct id_index_event' " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 08/23] libperf: Add PERF_RECORD_AUXTRACE_INFO 'struct auxtrace_info_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 09/23] libperf: Add PERF_RECORD_AUXTRACE 'struct auxtrace_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 10/23] libperf: Add PERF_RECORD_AUXTRACE_ERROR 'struct auxtrace_error_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 11/23] libperf: Add PERF_RECORD_AUX 'struct aux_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 12/23] libperf: Add PERF_RECORD_ITRACE_START 'struct itrace_start_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 13/23] libperf: Add PERF_RECORD_SWITCH 'struct context_switch_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 14/23] libperf: Add PERF_RECORD_THREAD_MAP 'struct thread_map_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 15/23] libperf: Add PERF_RECORD_STAT_CONFIG 'struct stat_config_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 16/23] libperf: Add PERF_RECORD_STAT 'struct stat_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 17/23] libperf: Add PERF_RECORD_STAT_ROUND 'struct stat_round_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 18/23] libperf: Add PERF_RECORD_TIME_CONV 'struct time_conv_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 19/23] libperf: Add PERF_RECORD_HEADER_FEATURE 'struct feature_event' " Jiri Olsa
2019-08-29 19:02 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 20/23] libperf: Add PERF_RECORD_COMPRESSED 'struct compressed_event' " Jiri Olsa
2019-08-29 19:02 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 21/23] libperf: Add 'union perf_event' " Jiri Olsa
2019-08-29 19:02 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 22/23] libperf: Rename the PERF_RECORD_ structs to have a "perf" prefix Jiri Olsa
2019-08-29 19:02 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 13:57 ` [PATCH 23/23] libperf: Move 'enum perf_user_event_type' to perf/event.h Jiri Olsa
2019-08-29 19:02 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2019-08-28 18:29 ` [PATCH 00/23] libperf: Add rest of events " Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828135717.7245-8-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).