d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: fix alarm clock type for glibc < 2.12

Browse Source 
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 <ferruh.yigit@intel.com>
This commit is contained in:
Ferruh Yigit 2015-11-19 11:23:42 +00:00 committed by Thomas Monjalon
parent d992985ff3
commit cba0d5f101
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/librte_eal/linuxapp/eal/eal_alarm.c
View File

@ -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;