From 1cc275ef61c5ddd5f9be7519b3b9db381947782e Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Wed, 13 Jul 2016 14:30:41 +0200 Subject: [PATCH 1/1] mempool: fix empty structure definition 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 Acked-by: Olivier Matz --- 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 6ec09063db..8806633b5a 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 fb7052e145..4a8fbb1e5b 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.20.1