diff mbox

[dpdk-dev,v2,1/2] ring: fix declaration after code

Message ID 152749821848.44120.9534717185541492433.stgit@localhost.localdomain (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Andy Green May 28, 2018, 9:03 a.m. UTC 
  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 <andy@warmcat.com>
Fixes: 39368ebfc6 ("ring: introduce C11 memory model barrier option")
---
 lib/librte_ring/rte_ring_c11_mem.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Olivier Matz July 16, 2018, 7:15 a.m. UTC | #1 
On Mon, May 28, 2018 at 05:03:38PM +0800, Andy Green wrote:
> 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 <andy@warmcat.com>
> Fixes: 39368ebfc6 ("ring: introduce C11 memory model barrier option")

Acked-by: Olivier Matz <olivier.matz@6wind.com>
diff mbox

Patch

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)