timer: protect initialization with lock

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

diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index ca88454..269e921 100644 (file)
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -26,7 +26,6 @@
 #include <rte_memzone.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
-#include <rte_function_versioning.h>
 
 #include "rte_timer.h"
 
@@ -146,11 +145,13 @@ rte_timer_subsystem_init(void)
        const size_t mem_size = data_arr_size + sizeof(*rte_timer_mz_refcnt);
        bool do_full_init = true;
 
-       if (rte_timer_subsystem_initialized)
-               return -EALREADY;
-
        rte_mcfg_timer_lock();
 
+       if (rte_timer_subsystem_initialized) {
+               rte_mcfg_timer_unlock();
+               return -EALREADY;
+       }
+
        mz = rte_memzone_lookup(mz_name);
        if (mz == NULL) {
                mz = rte_memzone_reserve_aligned(mz_name, mem_size,
@@ -184,27 +185,29 @@ rte_timer_subsystem_init(void)
        rte_timer_data_arr[default_data_id].internal_flags |= FL_ALLOCATED;
        (*rte_timer_mz_refcnt)++;
 
-       rte_mcfg_timer_unlock();
-
        rte_timer_subsystem_initialized = 1;
 
+       rte_mcfg_timer_unlock();
+
        return 0;
 }
 
 void
 rte_timer_subsystem_finalize(void)
 {
-       if (!rte_timer_subsystem_initialized)
-               return;
-
        rte_mcfg_timer_lock();
 
+       if (!rte_timer_subsystem_initialized) {
+               rte_mcfg_timer_unlock();
+               return;
+       }
+
        if (--(*rte_timer_mz_refcnt) == 0)
                rte_memzone_free(rte_timer_data_mz);
 
-       rte_mcfg_timer_unlock();
-
        rte_timer_subsystem_initialized = 0;
+
+       rte_mcfg_timer_unlock();
 }
 
 /* Initialize the timer handle tim for use */
@@ -978,6 +981,33 @@ rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores,
        return 0;
 }
 
+int64_t
+rte_timer_next_ticks(void)
+{
+       unsigned int lcore_id = rte_lcore_id();
+       struct rte_timer_data *timer_data;
+       struct priv_timer *priv_timer;
+       const struct rte_timer *tm;
+       uint64_t cur_time;
+       int64_t left = -ENOENT;
+
+       TIMER_DATA_VALID_GET_OR_ERR_RET(default_data_id, timer_data, -EINVAL);
+
+       priv_timer = timer_data->priv_timer;
+       cur_time = rte_get_timer_cycles();
+
+       rte_spinlock_lock(&priv_timer[lcore_id].list_lock);
+       tm = priv_timer[lcore_id].pending_head.sl_next[0];
+       if (tm) {
+               left = tm->expire - cur_time;
+               if (left < 0)
+                       left = 0;
+       }
+       rte_spinlock_unlock(&priv_timer[lcore_id].list_lock);
+
+       return left;
+}
+
 /* dump statistics about timers */
 static void
 __rte_timer_dump_stats(struct rte_timer_data *timer_data __rte_unused, FILE *f)