git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eventdev: use new event enqueue in Rx adapter
[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
18782fa
..
78158ab
100644
(file)
--- a/
lib/librte_timer/rte_timer.c
+++ b/
lib/librte_timer/rte_timer.c
@@
-46,11
+46,11
@@
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_eal.h>
-#include <rte_per_lcore.h>
#include <rte_lcore.h>
#include <rte_branch_prediction.h>
#include <rte_spinlock.h>
#include <rte_random.h>
#include <rte_lcore.h>
#include <rte_branch_prediction.h>
#include <rte_spinlock.h>
#include <rte_random.h>
+#include <rte_pause.h>
#include "rte_timer.h"
#include "rte_timer.h"
@@
-183,7
+183,7
@@
timer_set_running_state(struct rte_timer *tim)
return -1;
/* here, we know that timer is stopped or pending,
return -1;
/* here, we know that timer is stopped or pending,
- * mark it atomically as be
e
ing configured */
+ * mark it atomically as being configured */
status.state = RTE_TIMER_RUNNING;
status.owner = (int16_t)lcore_id;
success = rte_atomic32_cmpset(&tim->status.u32,
status.state = RTE_TIMER_RUNNING;
status.owner = (int16_t)lcore_id;
success = rte_atomic32_cmpset(&tim->status.u32,
@@
-432,7
+432,8
@@
rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
uint64_t period;
if (unlikely((tim_lcore != (unsigned)LCORE_ID_ANY) &&
uint64_t period;
if (unlikely((tim_lcore != (unsigned)LCORE_ID_ANY) &&
- !rte_lcore_is_enabled(tim_lcore)))
+ !(rte_lcore_is_enabled(tim_lcore) ||
+ rte_lcore_has_role(tim_lcore, ROLE_SERVICE))))
return -1;
if (type == PERIODICAL)
return -1;
if (type == PERIODICAL)
@@
-525,7
+526,7
@@
void rte_timer_manage(void)
return;
cur_time = rte_get_timer_cycles();
return;
cur_time = rte_get_timer_cycles();
-#ifdef RTE_ARCH_
X86_
64
+#ifdef RTE_ARCH_64
/* on 64-bit the value cached in the pending_head.expired will be
* updated atomically, so we can consult that for a quick check here
* outside the lock */
/* on 64-bit the value cached in the pending_head.expired will be
* updated atomically, so we can consult that for a quick check here
* outside the lock */