From: "tip-bot2 for Jiri Olsa" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: perf/core] libperf: Add PERF_RECORD_STAT_ROUND 'struct stat_round_event' to perf/event.h
Date: Thu, 29 Aug 2019 19:01:59 -0000 [thread overview]
Message-ID: <156710531922.10592.17801158953189534104.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190828135717.7245-18-jolsa@kernel.org>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 782adbe2964953803ea1a38b80f6255c336cdd7b
Gitweb: https://git.kernel.org/tip/782adbe2964953803ea1a38b80f6255c336cdd7b
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 28 Aug 2019 15:57:11 +02:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Thu, 29 Aug 2019 08:36:12 -03:00
libperf: Add PERF_RECORD_STAT_ROUND 'struct stat_round_event' to perf/event.h
Move the PERF_RECORD_STAT_ROUND 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.
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-18-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/lib/include/perf/event.h | 6 ++++++
tools/perf/util/event.h | 6 ------
tools/perf/util/stat.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/perf/lib/include/perf/event.h b/tools/perf/lib/include/perf/event.h
index 7d1834f..34d365b 100644
--- a/tools/perf/lib/include/perf/event.h
+++ b/tools/perf/lib/include/perf/event.h
@@ -299,4 +299,10 @@ struct stat_event {
};
};
+struct stat_round_event {
+ struct perf_event_header header;
+ __u64 type;
+ __u64 time;
+};
+
#endif /* __LIBPERF_EVENT_H */
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index f3a02e0..ec76412 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -337,12 +337,6 @@ enum {
PERF_STAT_ROUND_TYPE__FINAL = 1,
};
-struct stat_round_event {
- struct perf_event_header header;
- u64 type;
- u64 time;
-};
-
struct time_conv_event {
struct perf_event_header header;
u64 time_shift;
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index c0cd9f9..4c79574 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -418,7 +418,7 @@ size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp)
struct stat_round_event *rd = (struct stat_round_event *)event;
size_t ret;
- ret = fprintf(fp, "\n... time %" PRIu64 ", type %s\n", rd->time,
+ ret = fprintf(fp, "\n... time %" PRI_lu64 ", type %s\n", rd->time,
rd->type == PERF_STAT_ROUND_TYPE__FINAL ? "FINAL" : "INTERVAL");
return ret;
next prev parent reply other threads:[~2019-08-29 19:02 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 ` [PATCH 07/23] libperf: Add PERF_RECORD_ID_INDEX 'struct id_index_event' " Jiri Olsa
2019-08-29 19:01 ` [tip: perf/core] " 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-bot2 for Jiri Olsa [this message]
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=156710531922.10592.17801158953189534104.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).