From: David Ahern <dsahern@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jiri Olsa <jolsa@redhat.com>,
John Stultz <john.stultz@linaro.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Stephane Eranian <eranian@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: Re: [PATCH 15/16] perf record: Add clockid parameter
Date: Tue, 07 Apr 2015 13:06:31 -0600 [thread overview]
Message-ID: <55242AB7.9040602@gmail.com> (raw)
In-Reply-To: <1428424862-30032-16-git-send-email-acme@kernel.org>
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
next prev parent reply other threads:[~2015-04-07 19:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-07 16:40 [GIT PULL 00/16] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-04-07 16:40 ` Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 01/16] perf top: Consider PERF_RECORD_ events with cpumode == 0 Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 02/16] perf evlist: Fix inverted logic in perf_mmap__empty Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 03/16] perf kmaps: Check kmaps to make code more robust Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 04/16] tools lib traceevent: Honor operator priority Arnaldo Carvalho de Melo
2015-04-07 16:40 ` Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 05/16] perf kmem: Respect -i option Arnaldo Carvalho de Melo
2015-04-07 16:40 ` Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 06/16] perf sched replay: Use struct task_desc instead of struct task_task for correct meaning Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 07/16] perf sched replay: Increase the MAX_PID value to fix assertion failure problem Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 08/16] perf sched replay: Alloc the memory of pid_to_task dynamically to adapt to the unexpected change of pid_max Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 09/16] perf sched replay: Realloc the memory of pid_to_task stepwise to adapt to the different pid_max configurations Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 10/16] perf sched replay: Fix the segmentation fault problem caused by pr_err in threads Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 11/16] perf sched replay: Handle the dead halt of sem_wait when create_tasks() fails for any task Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 12/16] perf sched replay: Fix the EMFILE error caused by the limitation of the maximum open files Arnaldo Carvalho de Melo
2015-04-07 16:40 ` [PATCH 13/16] perf sched replay: Support using -f to override perf.data file ownership Arnaldo Carvalho de Melo
2015-04-07 16:41 ` [PATCH 14/16] perf sched replay: Use replay_repeat to calculate the runavg of cpu usage instead of the default value 10 Arnaldo Carvalho de Melo
2015-04-07 16:41 ` [PATCH 15/16] perf record: Add clockid parameter Arnaldo Carvalho de Melo
2015-04-07 19:06 ` David Ahern [this message]
2015-04-07 20:20 ` Arnaldo Carvalho de Melo
2015-04-07 16:41 ` [PATCH 16/16] perf tools: Merge all perf_event_attr print functions 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=55242AB7.9040602@gmail.com \
--to=dsahern@gmail.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=akpm@linux-foundation.org \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.