From 772cf390b060a85a5195771ca3c54f30ed81979c Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 5 Oct 2016 10:39:56 -0700 Subject: [PATCH] event: remove DPDK rte_timer dependency 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 --- lib/env/env.mk | 2 +- lib/event/reactor.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/env/env.mk b/lib/env/env.mk index 62020ecb3..1748e3b43 100644 --- a/lib/env/env.mk +++ b/lib/env/env.mk @@ -51,7 +51,7 @@ endif DPDK_INC = -I$(DPDK_ABS_DIR)/include 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 # existence to maintain backward compatibility. diff --git a/lib/event/reactor.c b/lib/event/reactor.c index 50d2c6f6e..267a7838a 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -51,7 +51,6 @@ #include #include #include -#include #include "reactor.h" @@ -352,8 +351,6 @@ _spdk_reactor_run(void *arg) last_action = rte_get_timer_cycles(); } - rte_timer_manage(); - poller = TAILQ_FIRST(&reactor->active_pollers); if (poller) { TAILQ_REMOVE(&reactor->active_pollers, poller, tailq);