From: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Date: Fri, 26 Apr 2019 14:41:24 +0000 (-0500)
Subject: timer: fix reset/stop in callback for new API
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=0efd46d7955de6a7b5d011fcac51bd42a8e6409b;p=dpdk.git

timer: fix reset/stop in callback for new API

The rte_timer_alt_manage function should track which is the running
timer and whether or not it was updated by a callback in the priv_timer
structure that corresponds to the running lcore, so that restarting
or stopping the timer from the callback works correctly.

Fixes: c0749f7096c7 ("timer: allow management in shared memory")

Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
---

diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index d443b8caf8..9f2e921a8a 100644
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -830,7 +830,6 @@ rte_timer_alt_manage(uint32_t timer_data_id,
 	union rte_timer_status status;
 	struct rte_timer *tim, *next_tim, **pprev;
 	struct rte_timer *run_first_tims[RTE_MAX_LCORE];
-	unsigned int runlist_lcore_ids[RTE_MAX_LCORE];
 	unsigned int this_lcore = rte_lcore_id();
 	struct rte_timer *prev[MAX_SKIPLIST_DEPTH + 1];
 	uint64_t cur_time;
@@ -899,7 +898,6 @@ rte_timer_alt_manage(uint32_t timer_data_id,
 
 		/* transition run-list from PENDING to RUNNING */
 		run_first_tims[nb_runlists] = tim;
-		runlist_lcore_ids[nb_runlists] = poll_lcore;
 		pprev = &run_first_tims[nb_runlists];
 		nb_runlists++;
 
@@ -946,25 +944,24 @@ rte_timer_alt_manage(uint32_t timer_data_id,
 			break;
 
 		tim = run_first_tims[min_idx];
-		privp = &data->priv_timer[runlist_lcore_ids[min_idx]];
 
 		/* Move down the runlist from which we picked a timer to
 		 * execute
 		 */
 		run_first_tims[min_idx] = run_first_tims[min_idx]->sl_next[0];
 
-		privp->updated = 0;
-		privp->running_tim = tim;
+		data->priv_timer[this_lcore].updated = 0;
+		data->priv_timer[this_lcore].running_tim = tim;
 
 		/* Call the provided callback function */
 		f(tim);
 
-		__TIMER_STAT_ADD(privp, pending, -1);
+		__TIMER_STAT_ADD(data->priv_timer, pending, -1);
 
 		/* the timer was stopped or reloaded by the callback
 		 * function, we have nothing to do here
 		 */
-		if (privp->updated == 1)
+		if (data->priv_timer[this_lcore].updated == 1)
 			continue;
 
 		if (tim->period == 0) {
@@ -989,7 +986,7 @@ rte_timer_alt_manage(uint32_t timer_data_id,
 				&data->priv_timer[this_lcore].list_lock);
 		}
 
-		privp->running_tim = NULL;
+		data->priv_timer[this_lcore].running_tim = NULL;
 	}
 
 	return 0;