tailq: remove unneeded inclusions

[dpdk.git] / lib / librte_timer / rte_timer.c

diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
old mode 100755 (executable)
new mode 100644 (file)
index f0f0c2f..8e9243a
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -35,6 +35,8 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
+#include <assert.h>
+#include <sys/queue.h>
 
 #include <rte_atomic.h>
 #include <rte_common.h>
@@ -43,7 +45,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -79,9 +80,10 @@ static struct priv_timer priv_timer[RTE_MAX_LCORE];
 
 /* when debug is enabled, store some statistics */
 #ifdef RTE_LIBRTE_TIMER_DEBUG
-#define __TIMER_STAT_ADD(name, n) do {                         \
-               unsigned __lcore_id = rte_lcore_id();           \
-               priv_timer[__lcore_id].stats.name += (n);       \
+#define __TIMER_STAT_ADD(name, n) do {                                 \
+               unsigned __lcore_id = rte_lcore_id();                   \
+               if (__lcore_id < RTE_MAX_LCORE)                         \
+                       priv_timer[__lcore_id].stats.name += (n);       \
        } while(0)
 #else
 #define __TIMER_STAT_ADD(name, n) do {} while(0)
@@ -135,7 +137,7 @@ timer_set_config_state(struct rte_timer *tim,
 
                /* timer is running on another core, exit */
                if (prev_status.state == RTE_TIMER_RUNNING &&
-                   (unsigned)prev_status.owner != lcore_id)
+                   prev_status.owner != (uint16_t)lcore_id)
                        return -1;
 
                /* timer is being configured on another core */
@@ -366,9 +368,16 @@ __rte_timer_reset(struct rte_timer *tim, uint64_t expire,
 
        /* round robin for tim_lcore */
        if (tim_lcore == (unsigned)LCORE_ID_ANY) {
-               tim_lcore = rte_get_next_lcore(priv_timer[lcore_id].prev_lcore,
-                                              0, 1);
-               priv_timer[lcore_id].prev_lcore = tim_lcore;
+               if (lcore_id < RTE_MAX_LCORE) {
+                       /* EAL thread with valid lcore_id */
+                       tim_lcore = rte_get_next_lcore(
+                               priv_timer[lcore_id].prev_lcore,
+                               0, 1);
+                       priv_timer[lcore_id].prev_lcore = tim_lcore;
+               } else
+                       /* non-EAL thread do not run rte_timer_manage(),
+                        * so schedule the timer on the first enabled lcore. */
+                       tim_lcore = rte_get_next_lcore(LCORE_ID_ANY, 0, 1);
        }
 
        /* wait that the timer is in correct status before update,
@@ -378,7 +387,8 @@ __rte_timer_reset(struct rte_timer *tim, uint64_t expire,
                return -1;
 
        __TIMER_STAT_ADD(reset, 1);
-       if (prev_status.state == RTE_TIMER_RUNNING) {
+       if (prev_status.state == RTE_TIMER_RUNNING &&
+           lcore_id < RTE_MAX_LCORE) {
                priv_timer[lcore_id].updated = 1;
        }
 
@@ -424,10 +434,8 @@ rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
        else
                period = 0;
 
-       __rte_timer_reset(tim,  cur_time + ticks, period, tim_lcore,
+       return __rte_timer_reset(tim,  cur_time + ticks, period, tim_lcore,
                          fct, arg, 0);
-
-       return 0;
 }
 
 /* loop until rte_timer_reset() succeed */
@@ -437,7 +445,8 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks,
                     rte_timer_cb_t fct, void *arg)
 {
        while (rte_timer_reset(tim, ticks, type, tim_lcore,
-                              fct, arg) != 0);
+                              fct, arg) != 0)
+               rte_pause();
 }
 
 /* Stop the timer associated with the timer handle tim */
@@ -455,7 +464,8 @@ rte_timer_stop(struct rte_timer *tim)
                return -1;
 
        __TIMER_STAT_ADD(stop, 1);
-       if (prev_status.state == RTE_TIMER_RUNNING) {
+       if (prev_status.state == RTE_TIMER_RUNNING &&
+           lcore_id < RTE_MAX_LCORE) {
                priv_timer[lcore_id].updated = 1;
        }
 
@@ -499,6 +509,9 @@ void rte_timer_manage(void)
        uint64_t cur_time;
        int i, ret;
 
+       /* timer manager only runs on EAL thread with valid lcore_id */
+       assert(lcore_id < RTE_MAX_LCORE);
+
        __TIMER_STAT_ADD(manage, 1);
        /* optimize for the case where per-cpu list is empty */
        if (priv_timer[lcore_id].pending_head.sl_next[0] == NULL)