From patchwork Mon May 28 09:03:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 40459 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 56F6B31FC; Mon, 28 May 2018 11:03:43 +0200 (CEST) Received: from mail.warmcat.com (mail.warmcat.com [163.172.24.82]) by dpdk.org (Postfix) with ESMTP id 476442C57 for ; Mon, 28 May 2018 11:03:42 +0200 (CEST) From: Andy Green To: dev@dpdk.org Date: Mon, 28 May 2018 17:03:38 +0800 Message-ID: <152749821848.44120.9534717185541492433.stgit@localhost.localdomain> In-Reply-To: <152749815575.44120.3090426090234773551.stgit@localhost.localdomain> References: <152749815575.44120.3090426090234773551.stgit@localhost.localdomain> User-Agent: StGit/unknown-version Subject: [dpdk-dev] [PATCH v2 1/2] ring: fix declaration after code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On gcc 5.4.0 / native aarch64 from Ubuntu 16.04: /home/agreen/lagopus/src/dpdk/build/include/ rte_ring_c11_mem.h: In function '__rte_ring_move_prod_head': /home/agreen/lagopus/src/dpdk/build/include/ rte_ring_c11_mem.h:69:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] const uint32_t cons_tail = r->cons.tail; ^ /home/agreen/lagopus/src/dpdk/build/include/ rte_ring_c11_mem.h: In function '__rte_ring_move_cons_head': /home/agreen/lagopus/src/dpdk/build/include/ rte_ring_c11_mem.h:136:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] const uint32_t prod_tail = r->prod.tail; ^ Signed-off-by: Andy Green Fixes: 39368ebfc6 ("ring: introduce C11 memory model barrier option") Acked-by: Olivier Matz --- lib/librte_ring/rte_ring_c11_mem.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_ring/rte_ring_c11_mem.h b/lib/librte_ring/rte_ring_c11_mem.h index cb3f82b1a..94df3c4a6 100644 --- a/lib/librte_ring/rte_ring_c11_mem.h +++ b/lib/librte_ring/rte_ring_c11_mem.h @@ -66,14 +66,14 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, *old_head = __atomic_load_n(&r->prod.head, __ATOMIC_ACQUIRE); - const uint32_t cons_tail = r->cons.tail; + /* * The subtraction is done between two unsigned 32bits value * (the result is always modulo 32 bits even if we have * *old_head > cons_tail). So 'free_entries' is always between 0 * and capacity (which is < size). */ - *free_entries = (capacity + cons_tail - *old_head); + *free_entries = (capacity + r->cons.tail - *old_head); /* check that we have enough room in ring */ if (unlikely(n > *free_entries)) @@ -133,13 +133,13 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc, n = max; *old_head = __atomic_load_n(&r->cons.head, __ATOMIC_ACQUIRE); - const uint32_t prod_tail = r->prod.tail; + /* The subtraction is done between two unsigned 32bits value * (the result is always modulo 32 bits even if we have * cons_head > prod_tail). So 'entries' is always between 0 * and size(ring)-1. */ - *entries = (prod_tail - *old_head); + *entries = (r->prod.tail - *old_head); /* Set the actual entries for dequeue */ if (n > *entries)