ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event: remove DPDK rte_timer dependency

Browse Source 
All timers have been converted to SPDK pollers.

If an app requires rte_timer support, it should register its own poller
that calls rte_timer_manage().

Change-Id: I8a827a357b344deac76d42357a5a84ac2daabbf8
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-10-05 10:39:56 -07:00
parent 3e8487f88e
commit 772cf390b0
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/env/env.mk vendored
View File

@ -51,7 +51,7 @@ endif
DPDK_INC = -I$(DPDK_ABS_DIR)/include DPDK_INC = -I$(DPDK_ABS_DIR)/include
DPDK_LIB = $(DPDK_ABS_DIR)/lib/librte_eal.a $(DPDK_ABS_DIR)/lib/librte_mempool.a \ DPDK_LIB = $(DPDK_ABS_DIR)/lib/librte_eal.a $(DPDK_ABS_DIR)/lib/librte_mempool.a \
$(DPDK_ABS_DIR)/lib/librte_ring.a $(DPDK_ABS_DIR)/lib/librte_timer.a $(DPDK_ABS_DIR)/lib/librte_ring.a
# librte_malloc was removed after DPDK 2.1. Link this library conditionally based on its # librte_malloc was removed after DPDK 2.1. Link this library conditionally based on its
# existence to maintain backward compatibility. # existence to maintain backward compatibility.

3
lib/event/reactor.c
View File

@ -51,7 +51,6 @@
#include <rte_cycles.h> #include <rte_cycles.h>
#include <rte_mempool.h> #include <rte_mempool.h>
#include <rte_ring.h> #include <rte_ring.h>
#include <rte_timer.h>
#include "reactor.h" #include "reactor.h"
@ -352,8 +351,6 @@ _spdk_reactor_run(void *arg)
last_action = rte_get_timer_cycles(); last_action = rte_get_timer_cycles();
} }
rte_timer_manage();
poller = TAILQ_FIRST(&reactor->active_pollers); poller = TAILQ_FIRST(&reactor->active_pollers);
if (poller) { if (poller) {
TAILQ_REMOVE(&reactor->active_pollers, poller, tailq); TAILQ_REMOVE(&reactor->active_pollers, poller, tailq);