[PATCH] mempool: fix empty structure definition

[PATCH] mempool: fix empty structure definition

[Adrien Mazarguil]

This commit addresses the following warning reported by clang, which
happens by default, as long as CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is disabled:

 warning: empty struct has size 0 in C, size 1 in C++

C and C++ must use the same size for objects to avoid corruption during run
time.

Fixes: 97e7e685bfcd ("mempool: add structure for object trailers")

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
 lib/librte_mempool/rte_mempool.c | 4 ++++
 lib/librte_mempool/rte_mempool.h | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 6ec0906..8806633 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -199,7 +199,11 @@ rte_mempool_calc_obj_size(uint32_t elt_size, uint32_t flags,
 		sz->header_size = RTE_ALIGN_CEIL(sz->header_size,
 			RTE_MEMPOOL_ALIGN);
 
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
 	sz->trailer_size = sizeof(struct rte_mempool_objtlr);
+#else
+	sz->trailer_size = 0;
+#endif
 
 	/* element size is 8 bytes-aligned at least */
 	sz->elt_size = RTE_ALIGN_CEIL(elt_size, sizeof(uint64_t));
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index fb7052e..4a8fbb1 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -163,6 +163,8 @@ struct rte_mempool_objhdr {
  */
 STAILQ_HEAD(rte_mempool_objhdr_list, rte_mempool_objhdr);
 
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+
 /**
  * Mempool object trailer structure
  *
@@ -170,11 +172,11 @@ STAILQ_HEAD(rte_mempool_objhdr_list, rte_mempool_objhdr);
  * trailer structure containing a cookie preventing memory corruptions.
  */
 struct rte_mempool_objtlr {
-#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
 	uint64_t cookie;                 /**< Debug cookie. */
-#endif
 };
 
+#endif
+
 /**
  * A list of memory where objects are stored
  */
-- 
2.1.4

Re: [PATCH] mempool: fix empty structure definition

[Olivier MATZ]

On 07/13/2016 02:30 PM, Adrien Mazarguil wrote:
> This commit addresses the following warning reported by clang, which
> happens by default, as long as CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is disabled:
>
>   warning: empty struct has size 0 in C, size 1 in C++
>
> C and C++ must use the same size for objects to avoid corruption during run
> time.
>
> Fixes: 97e7e685bfcd ("mempool: add structure for object trailers")
>
> Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

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

Re: [PATCH] mempool: fix empty structure definition

[Thomas Monjalon]

> > This commit addresses the following warning reported by clang, which
> > happens by default, as long as CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG is disabled:
> >
> >   warning: empty struct has size 0 in C, size 1 in C++
> >
> > C and C++ must use the same size for objects to avoid corruption during run
> > time.
> >
> > Fixes: 97e7e685bfcd ("mempool: add structure for object trailers")
> >
> > Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
> 
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Applied, thanks