Messages in this thread | | | Date | Wed, 8 Apr 2015 10:03:08 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf record: Conditionally define CLOCK_MONOTONIC_RAW for older OSes |
| |
Em Wed, Apr 08, 2015 at 12:02:28PM +0800, Yunlong Song escreveu: > Commit 31a9883106cc ("perf record: Add clockid parameter") used > CLOCK_MONOTONIC_RAW in the struct clockid_map clockids[], but the > CLOCK_MONOTONIC_RAW macro is not defined in older releases (e.g., SLES > 11 SP2), thus there is a building error when making perf: > > builtin-record.c:738: error: ‘CLOCK_MONOTONIC_RAW’ undeclared here (not in a function) > make[2]: *** [builtin-record.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > LD bench/perf-in.o > LD tests/perf-in.o > make[1]: *** [perf-in.o] Error 2 > make: *** [all] Error 2 > > So define this macro if it is not defined.
Since I am fixing that pull request batch, I am folding this patch into Peter's original, adding credit to you, ok?
- Arnaldo
> Signed-off-by: Yunlong Song <yunlong.song@huawei.com> > --- > tools/perf/builtin-record.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c > index cfdff50..5b0962a 100644 > --- a/tools/perf/builtin-record.c > +++ b/tools/perf/builtin-record.c > @@ -731,6 +731,9 @@ struct clockid_map { > #ifndef CLOCK_TAI > #define CLOCK_TAI 11 > #endif > +#ifndef CLOCK_MONOTONIC_RAW > +#define CLOCK_MONOTONIC_RAW 4 > +#endif > > static const struct clockid_map clockids[] = { > /* available for all events, NMI safe */ > -- > 1.8.5.5
| |