net/virtio: fix incorrect cast of void *

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_alarm.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c
index e8da32f..8e4a775 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_alarm.c
+++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c
@@ -40,12 +40,10 @@
 #include <sys/timerfd.h>
 
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_per_lcore.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_launch.h>
 #include <rte_lcore.h>
@@ -64,6 +62,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;
@@ -78,7 +82,7 @@ static rte_spinlock_t alarm_list_lk = RTE_SPINLOCK_INITIALIZER;
 
 static struct rte_intr_handle intr_handle = {.fd = -1 };
 static int handler_registered = 0;
-static void eal_alarm_callback(struct rte_intr_handle *hdl, void *arg);
+static void eal_alarm_callback(void *arg);
 
 int
 rte_eal_alarm_init(void)
@@ -97,17 +101,16 @@ error:
 }
 
 static void
-eal_alarm_callback(struct rte_intr_handle *hdl __rte_unused,
-               void *arg __rte_unused)
+eal_alarm_callback(void *arg __rte_unused)
 {
-       struct timeval now;
+       struct timespec now;
        struct alarm_entry *ap;
 
        rte_spinlock_lock(&alarm_list_lk);
        while ((ap = LIST_FIRST(&alarm_list)) !=NULL &&
-                       gettimeofday(&now, NULL) == 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 <= now.tv_usec))){
+                                               (ap->time.tv_usec * NS_PER_US) <= now.tv_nsec))) {
                ap->executing = 1;
                ap->executing_id = pthread_self();
                rte_spinlock_unlock(&alarm_list_lk);
@@ -127,11 +130,11 @@ eal_alarm_callback(struct rte_intr_handle *hdl __rte_unused,
                atime.it_value.tv_sec = ap->time.tv_sec;
                atime.it_value.tv_nsec = ap->time.tv_usec * NS_PER_US;
                /* perform borrow for subtraction if necessary */
-               if (now.tv_usec > ap->time.tv_usec)
+               if (now.tv_nsec > (ap->time.tv_usec * NS_PER_US))
                        atime.it_value.tv_sec--, atime.it_value.tv_nsec += US_PER_S * NS_PER_US;
 
                atime.it_value.tv_sec -= now.tv_sec;
-               atime.it_value.tv_nsec -= now.tv_usec * NS_PER_US;
+               atime.it_value.tv_nsec -= now.tv_nsec;
                timerfd_settime(intr_handle.fd, 0, &atime, NULL);
        }
        rte_spinlock_unlock(&alarm_list_lk);
@@ -140,7 +143,7 @@ eal_alarm_callback(struct rte_intr_handle *hdl __rte_unused,
 int
 rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)
 {
-       struct timeval now;
+       struct timespec now;
        int ret = 0;
        struct alarm_entry *ap, *new_alarm;
 
@@ -153,12 +156,12 @@ 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 */
-       gettimeofday(&now, NULL);
+       clock_gettime(CLOCK_TYPE_ID, &now);
 
        new_alarm->cb_fn = cb_fn;
        new_alarm->cb_arg = cb_arg;
-       new_alarm->time.tv_usec = (now.tv_usec + us) % US_PER_S;
-       new_alarm->time.tv_sec = now.tv_sec + ((now.tv_usec + us) / US_PER_S);
+       new_alarm->time.tv_usec = ((now.tv_nsec / NS_PER_US) + us) % US_PER_S;
+       new_alarm->time.tv_sec = now.tv_sec + (((now.tv_nsec / NS_PER_US) + us) / US_PER_S);
 
        rte_spinlock_lock(&alarm_list_lk);
        if (!handler_registered) {