From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH v2 06/10] sched: drop RTE_SCHED_WRR #define Date: Fri, 13 Nov 2015 09:58:32 -0800 Message-ID: <1447437516-19152-7-git-send-email-stephen@networkplumber.org> References: <1447437516-19152-1-git-send-email-stephen@networkplumber.org> Cc: dev@dpdk.org, Stephen Hemminger To: cristian.dumitrescu@intel.com Return-path: Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by dpdk.org (Postfix) with ESMTP id DD24FC332 for ; Fri, 13 Nov 2015 18:58:30 +0100 (CET) Received: by pacdm15 with SMTP id dm15so106439960pac.3 for ; Fri, 13 Nov 2015 09:58:30 -0800 (PST) In-Reply-To: <1447437516-19152-1-git-send-email-stephen@networkplumber.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stephen Hemminger The RTE_SCHED_WRR value is always defined as 1. Signed-off-by: Stephen Hemminger --- lib/librte_sched/rte_sched.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 3400b73..1f8d3f8 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -64,8 +64,6 @@ #define RTE_SCHED_TB_RATE_CONFIG_ERR (1e-7) #endif -#define RTE_SCHED_WRR 1 - #ifndef RTE_SCHED_WRR_SHIFT #define RTE_SCHED_WRR_SHIFT 3 #endif @@ -1879,24 +1877,6 @@ grinder_next_pipe(struct rte_sched_port *port, uint32_t pos) return 1; } -#if RTE_SCHED_WRR == 0 - -#define grinder_wrr_load(a,b) - -#define grinder_wrr_store(a,b) - -static inline void -grinder_wrr(struct rte_sched_port *port, uint32_t pos) -{ - struct rte_sched_grinder *grinder = port->grinder + pos; - uint64_t slab = grinder->qmask; - - if (rte_bsf64(slab, &grinder->qpos) == 0) { - rte_panic("grinder wrr\n"); - } -} - -#elif RTE_SCHED_WRR == 1 static inline void grinder_wrr_load(struct rte_sched_port *port, uint32_t pos) @@ -1962,11 +1942,6 @@ grinder_wrr(struct rte_sched_port *port, uint32_t pos) grinder->wrr_tokens[3] -= wrr_tokens_min; } -#else - -#error Invalid value for RTE_SCHED_WRR - -#endif /* RTE_SCHED_WRR */ #define grinder_evict(port, pos) -- 2.1.4