From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH v2 05/10] sched: remove debug conditional code around ENQUEUE Date: Fri, 13 Nov 2015 09:58:31 -0800 Message-ID: <1447437516-19152-6-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-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by dpdk.org (Postfix) with ESMTP id 04098C322 for ; Fri, 13 Nov 2015 18:58:30 +0100 (CET) Received: by pacdm15 with SMTP id dm15so106439610pac.3 for ; Fri, 13 Nov 2015 09:58:29 -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 Remove RTE_SCHED_ENQUEUE ifdef that was always being set. Signed-off-by: Stephen Hemminger --- lib/librte_sched/rte_sched.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 689f001..3400b73 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -60,8 +60,6 @@ #include #endif -#define RTE_SCHED_ENQUEUE 1 - #ifndef RTE_SCHED_TB_RATE_CONFIG_ERR #define RTE_SCHED_TB_RATE_CONFIG_ERR (1e-7) #endif @@ -1275,35 +1273,6 @@ rte_sched_port_enqueue_qwa(struct rte_sched_port *port, uint32_t qindex, struct return 1; } -#if RTE_SCHED_ENQUEUE == 0 - -int -rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint32_t n_pkts) -{ - uint32_t result, i; - - result = 0; - - for (i = 0; i < n_pkts; i ++) { - struct rte_mbuf *pkt; - struct rte_mbuf **q_base; - uint32_t subport, pipe, traffic_class, queue, qindex; - - pkt = pkts[i]; - - rte_sched_port_pkt_read_tree_path(pkt, &subport, &pipe, &traffic_class, &queue); - - qindex = rte_sched_port_qindex(port, subport, pipe, traffic_class, queue); - - q_base = rte_sched_port_qbase(port, qindex); - - result += rte_sched_port_enqueue_qwa(port, qindex, q_base, pkt); - } - - return result; -} - -#else /* * The enqueue function implements a 4-level pipeline with each stage processing @@ -1466,9 +1435,7 @@ rte_sched_port_enqueue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint return result; } -#endif /* RTE_SCHED_ENQUEUE */ - -#if !defined(RTE_SCHED_SUBPORT_TC_OV) +#ifndef RTE_SCHED_SUBPORT_TC_OV static inline void grinder_credits_update(struct rte_sched_port *port, uint32_t pos) -- 2.1.4