From cba0d5f10178901b57ac189623ec13851fd6844e Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 19 Nov 2015 11:23:42 +0000 Subject: [PATCH] eal: fix alarm clock type for glibc < 2.12 CLOCK_MONOTONIC_RAW added in glibc 2.12, using this define in older glibc versions cause compile error: 'error: identifier "CLOCK_MONOTONIC_RAW" is undefined' This patch replaces "CLOCK_MONOTONIC_RAW" with "CLOCK_MONOTONIC" for older glibc versions, versions that support "CLOCK_MONOTONIC_RAW" will keep using this clock type. Fixes: d08d304508a8 ("eal/linux: make alarm not affected by system time jump") Signed-off-by: Ferruh Yigit --- lib/librte_eal/linuxapp/eal/eal_alarm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c index ff57323d16..8b042abc20 100644 --- a/lib/librte_eal/linuxapp/eal/eal_alarm.c +++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c @@ -63,6 +63,12 @@ #define MS_PER_S 1000 #define US_PER_S (US_PER_MS * MS_PER_S) +#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */ +#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW +#else +#define CLOCK_TYPE_ID CLOCK_MONOTONIC +#endif + struct alarm_entry { LIST_ENTRY(alarm_entry) next; struct timeval time; @@ -104,7 +110,7 @@ eal_alarm_callback(struct rte_intr_handle *hdl __rte_unused, rte_spinlock_lock(&alarm_list_lk); while ((ap = LIST_FIRST(&alarm_list)) !=NULL && - clock_gettime(CLOCK_MONOTONIC_RAW, &now) == 0 && + clock_gettime(CLOCK_TYPE_ID, &now) == 0 && (ap->time.tv_sec < now.tv_sec || (ap->time.tv_sec == now.tv_sec && (ap->time.tv_usec * NS_PER_US) <= now.tv_nsec))) { ap->executing = 1; @@ -152,7 +158,7 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg) return -ENOMEM; /* use current time to calculate absolute time of alarm */ - clock_gettime(CLOCK_MONOTONIC_RAW, &now); + clock_gettime(CLOCK_TYPE_ID, &now); new_alarm->cb_fn = cb_fn; new_alarm->cb_arg = cb_arg; -- 2.20.1