X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Flinuxapp%2Feal%2Feal_alarm.c;h=fbae46130f30374ec8d497aed7d0017fe3a929d2;hb=2f6fec53909b90fa653b5d6ace0c4aeb4cce25b7;hp=480f0cb6a60c6d620c3bb2148f150a5947ce9521;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c index 480f0cb6a6..fbae46130f 100644 --- a/lib/librte_eal/linuxapp/eal/eal_alarm.c +++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -64,12 +63,19 @@ #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; rte_eal_alarm_callback cb_fn; void *cb_arg; - volatile int executing; + volatile uint8_t executing; + volatile pthread_t executing_id; }; static LIST_HEAD(alarm_list, alarm_entry) alarm_list = LIST_HEAD_INITIALIZER(); @@ -77,7 +83,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) @@ -96,23 +102,24 @@ 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); ap->cb_fn(ap->cb_arg); rte_spinlock_lock(&alarm_list_lk); + LIST_REMOVE(ap, next); rte_free(ap); } @@ -124,11 +131,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); @@ -137,7 +144,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; @@ -145,18 +152,17 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg) if (us < 1 || us > (UINT64_MAX - US_PER_S) || cb_fn == NULL) return -EINVAL; - new_alarm = rte_malloc(NULL, sizeof(*new_alarm), 0); + new_alarm = rte_zmalloc(NULL, sizeof(*new_alarm), 0); if (new_alarm == NULL) 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->executing = 0; + 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) { @@ -202,34 +208,65 @@ rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn, void *cb_arg) { struct alarm_entry *ap, *ap_prev; int count = 0; + int err = 0; + int executing; - if (!cb_fn) + if (!cb_fn) { + rte_errno = EINVAL; return -1; - - rte_spinlock_lock(&alarm_list_lk); - /* remove any matches at the start of the list */ - while ((ap = LIST_FIRST(&alarm_list)) != NULL && - cb_fn == ap->cb_fn && ap->executing == 0 && - (cb_arg == (void *)-1 || cb_arg == ap->cb_arg)) { - LIST_REMOVE(ap, next); - rte_free(ap); - count++; } - ap_prev = ap; - /* now go through list, removing entries not at start */ - LIST_FOREACH(ap, &alarm_list, next) { - /* this won't be true first time through */ - if (cb_fn == ap->cb_fn && ap->executing == 0 && + do { + executing = 0; + rte_spinlock_lock(&alarm_list_lk); + /* remove any matches at the start of the list */ + while ((ap = LIST_FIRST(&alarm_list)) != NULL && + cb_fn == ap->cb_fn && (cb_arg == (void *)-1 || cb_arg == ap->cb_arg)) { - LIST_REMOVE(ap,next); - rte_free(ap); - count++; - ap = ap_prev; + + if (ap->executing == 0) { + LIST_REMOVE(ap, next); + rte_free(ap); + count++; + } else { + /* If calling from other context, mark that alarm is executing + * so loop can spin till it finish. Otherwise we are trying to + * cancel our self - mark it by EINPROGRESS */ + if (pthread_equal(ap->executing_id, pthread_self()) == 0) + executing++; + else + err = EINPROGRESS; + + break; + } } ap_prev = ap; - } - rte_spinlock_unlock(&alarm_list_lk); + + /* now go through list, removing entries not at start */ + LIST_FOREACH(ap, &alarm_list, next) { + /* this won't be true first time through */ + if (cb_fn == ap->cb_fn && + (cb_arg == (void *)-1 || cb_arg == ap->cb_arg)) { + + if (ap->executing == 0) { + LIST_REMOVE(ap, next); + rte_free(ap); + count++; + ap = ap_prev; + } else if (pthread_equal(ap->executing_id, pthread_self()) == 0) + executing++; + else + err = EINPROGRESS; + } + ap_prev = ap; + } + rte_spinlock_unlock(&alarm_list_lk); + } while (executing != 0); + + if (count == 0 && err == 0) + rte_errno = ENOENT; + else if (err) + rte_errno = err; + return count; } -