Re: [PATCH 15/16] perf record: Add clockid parameter

From: David Ahern
Date: Tue Apr 07 2015 - 15:06:41 EST


fails to compile on RHEL6/CentOS6/OL6 ...

On 4/7/15 10:41 AM, Arnaldo Carvalho de Melo wrote:
+/*
+ * Doesn't appear to have made it into userspace so define here if missing.
+ */
+#ifndef CLOCK_TAI
+#define CLOCK_TAI 11
+#endif
+
+static const struct clockid_map clockids[] = {
+ /* available for all events, NMI safe */
+ CLOCKID_MAP("monotonic", CLOCK_MONOTONIC),
+ CLOCKID_MAP("monotonic_raw", CLOCK_MONOTONIC_RAW),
+
+ /* available for some events */
+ CLOCKID_MAP("realtime", CLOCK_REALTIME),
+ CLOCKID_MAP("boottime", CLOCK_BOOTTIME),
+ CLOCKID_MAP("tai", CLOCK_TAI),
+
+ /* available for the lazy */
+ CLOCKID_MAP("mono", CLOCK_MONOTONIC),
+ CLOCKID_MAP("raw", CLOCK_MONOTONIC_RAW),
+ CLOCKID_MAP("real", CLOCK_REALTIME),
+ CLOCKID_MAP("boot", CLOCK_BOOTTIME),
+

builtin-record.c:738: error: ‘CLOCK_BOOTTIME’ undeclared here (not in a function)
make[2]: *** [/tmp/perf/builtin-record.o] Error 1
make[1]: *** [/tmp/perf/perf-in.o] Error 2
make: *** [all] Error 2

Need this similar to CLOCK_TAI:

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index f32edba4f84a..dbf1d508a1c0 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -728,6 +728,10 @@ struct clockid_map {
#define CLOCK_TAI 11
#endif

+#ifndef CLOCK_BOOTTIME
+#define CLOCK_BOOTTIME 7
+#endif
+
static const struct clockid_map clockids[] = {
/* available for all events, NMI safe */
CLOCKID_MAP("monotonic", CLOCK_MONOTONIC),

It would be best to add this delta before Ingo pulls it in to maintain git-bisect.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/