From patchwork Fri Nov 13 17:58:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 8923 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7F844C34A; Fri, 13 Nov 2015 18:58:33 +0100 (CET) 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A32pJURXA07c1E5epL4qJkMwY3RDo1JAzwGQ94jVzRw=; b=j/fBDVx9LmmpJ4jP/Z7JfTKCjRevEtyCDpzmxifgBWNjRE74aMhI5r2BL/wRp12J8t +kqDk7kHaWSOByzadQR9GNTuYf2OC3+8g3CIg6uQhbiJLa84Wf0DcYNkdI7BbcxTMFux DzSiccA1Dn29uA68laJJYIm1BdijAJGeNJAkkvaYzyBA80sXyRh8pR7WfxE9EvskVvjI Vb14Czttn6A+4Ptnu75OokRcmZiWHEZHNzx30Pu9zZqhzoI4KRFRm68I99bI0opwQrm7 yz9/TYjI8ZY42lbBTcBrrBobIgbCOOxsab/dx7MINhZmzxmDuQXIAmYKRuxruP0WJCVd Y4Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A32pJURXA07c1E5epL4qJkMwY3RDo1JAzwGQ94jVzRw=; b=NeYDzUptMV8wrSovgS49PeEdxHgiF8dN7icd4A2IZb3HKqOMFPKaPW1C2X3oijQlrV qw/CBmBCo50qD9MC7DG+qtKgCVobQICuSO3Tw1Vi0E0asfsm743TqD7/QFd83EGGO6Ls zgii0r5f31qfxCRpkUlSsuP0t3wUmqBwMTldug3igRDFhsJfjjKH2S+5wmS92XBT/YPM nBL6JB/Pz56jHOVzUTysHEMEJQEqxRIfc2HKJ7cf9W8uftYYQPKZhKUoFsAQXU4A+gIM LldObgNMsbPIdv2fvc39tCF0LvQEFy0Ib+7ZIfJ2gJ3U8QAmrH1WC0UtWWK9uOy35iVw VbcA== X-Gm-Message-State: ALoCoQmqqU46Xbs+GRnhRJz1h8BMIUT5cBtcVjysPOL5h7tGS2EVOwXUHe2oX4nZGre8UYADZEXI X-Received: by 10.66.243.3 with SMTP id wu3mr33917231pac.135.1447437509381; Fri, 13 Nov 2015 09:58:29 -0800 (PST) Received: from xeon-e3.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by smtp.gmail.com with ESMTPSA id bd10sm21603143pbd.29.2015.11.13.09.58.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Nov 2015 09:58:28 -0800 (PST) From: Stephen Hemminger To: cristian.dumitrescu@intel.com Date: Fri, 13 Nov 2015 09:58:31 -0800 Message-Id: <1447437516-19152-6-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447437516-19152-1-git-send-email-stephen@networkplumber.org> References: <1447437516-19152-1-git-send-email-stephen@networkplumber.org> Cc: dev@dpdk.org, Stephen Hemminger Subject: [dpdk-dev] [PATCH v2 05/10] sched: remove debug conditional code around ENQUEUE X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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)