From patchwork Fri Nov 13 17:58:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 8924 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 85C4AC328; Fri, 13 Nov 2015 18:58:35 +0100 (CET) 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) 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=UgZj7+3V1Zk1UYcy4FBbQgZHwTsEl1mGxmbAp6ohaBs=; b=FdRLmvHfP7LV7M/ec7ktpETIKQ6g4oaA6A37YeaT0YtHo3x8cXi0cjtejyT0NraUYC Vd8vEjmcnxdS3glcF7JPEkzQkkl2yB29t40/SQHb8xJTzuPA0vuHiB6B3uXogH4283s+ BI6FXfWOZb/kMPUsUU7AOHD6Rj2+yHaFavIb/FpSFUIJMd0rm/jpuyKS/pMq/wJ4Z1eK tTcQ9NfeoN9P0IFI463NZe4j+03JpEAygtm2YiQly+TYn6UlmPJNU5OsARLTVnk3Kf3N rU7XceTzrnepGPuST0vsJrNLnylJ4KJabrgJXaEKptjXV4tStvc1IakfB8r4Cfc7X3hk EBLA== 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=UgZj7+3V1Zk1UYcy4FBbQgZHwTsEl1mGxmbAp6ohaBs=; b=Gz6Ps1GVomdGgdJIFg0poWLPnYaazC+PhrdHnByBUXRV1GXOqyx2m2kv57xSmqBiw0 DaA7mnFiO7vhHEAOFNgs9NJJ3tS3ql94C8ZJd5OLKtsM+C51neGo9QyaDaVxYdxsrGnb QHr09frcdkyNYpuNw/ouVI+7rPmzkVyQPBVdUwNaDWgISvUJ+mgsfoMNFZdXgQyWxP3w DriYkBMzwt0D9H6vmHwx8gkxXpfrNWaaH9tyq6hvf7nIbwuOBBAURnG2kgbSc7giJz3q 28YoWbLAF69U/LjWCG61zcdWWOHYOqNH3aPgSVBKrjNi4kLYjErLxLqlimxuWnrfjyEb nVNQ== X-Gm-Message-State: ALoCoQlr8TXL5oPfc7FDeXTU5bWb6lvhjyfpPBAho9RJcW3JqkJzosU9a2xhaVB3U3VX9scL1Hpp X-Received: by 10.68.135.103 with SMTP id pr7mr6925118pbb.53.1447437510332; Fri, 13 Nov 2015 09:58:30 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Nov 2015 09:58:29 -0800 (PST) From: Stephen Hemminger To: cristian.dumitrescu@intel.com Date: Fri, 13 Nov 2015 09:58:32 -0800 Message-Id: <1447437516-19152-7-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 06/10] sched: drop RTE_SCHED_WRR #define 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 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)