From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olivier Matz Subject: [PATCH v3 14/35] mempool: remove macro to check if contiguous Date: Wed, 18 May 2016 13:04:35 +0200 Message-ID: <1463569496-31086-15-git-send-email-olivier.matz@6wind.com> References: <1460629199-32489-1-git-send-email-olivier.matz@6wind.com> <1463569496-31086-1-git-send-email-olivier.matz@6wind.com> Cc: bruce.richardson@intel.com, stephen@networkplumber.org, keith.wiles@intel.com To: dev@dpdk.org Return-path: Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id B05AA8E69 for ; Wed, 18 May 2016 13:05:15 +0200 (CEST) In-Reply-To: <1463569496-31086-1-git-send-email-olivier.matz@6wind.com> 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" This commit removes MEMPOOL_IS_CONTIG(). The next commits will change the behavior of the mempool library so that the objects will never be allocated in the same memzone than the mempool header. Therefore, there is no reason to keep this macro that would always return 0. This macro was only used in app/test. Signed-off-by: Olivier Matz --- app/test/test_mempool.c | 7 +++---- lib/librte_mempool/rte_mempool.h | 7 ------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c index 10e1fa4..2f317f2 100644 --- a/app/test/test_mempool.c +++ b/app/test/test_mempool.c @@ -126,12 +126,11 @@ test_mempool_basic(void) MEMPOOL_HEADER_SIZE(mp, mp->pg_num, mp->cache_size)) return -1; +#ifndef RTE_EXEC_ENV_BSDAPP /* rte_mem_virt2phy() not supported on bsd */ printf("get physical address of an object\n"); - if (MEMPOOL_IS_CONTIG(mp) && - rte_mempool_virt2phy(mp, obj) != - (phys_addr_t) (mp->phys_addr + - (phys_addr_t) ((char*) obj - (char*) mp))) + if (rte_mempool_virt2phy(mp, obj) != rte_mem_virt2phy(obj)) return -1; +#endif printf("put the object back\n"); rte_mempool_put(mp, obj); diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 4f95bdf..a65b63f 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -274,13 +274,6 @@ struct rte_mempool { (sizeof(*(mp)) + __PA_SIZE(mp, pgn) + (((cs) == 0) ? 0 : \ (sizeof(struct rte_mempool_cache) * RTE_MAX_LCORE))) -/** - * Return true if the whole mempool is in contiguous memory. - */ -#define MEMPOOL_IS_CONTIG(mp) \ - ((mp)->pg_num == MEMPOOL_PG_NUM_DEFAULT && \ - (mp)->phys_addr == (mp)->elt_pa[0]) - /* return the header of a mempool object (internal) */ static inline struct rte_mempool_objhdr *__mempool_get_header(void *obj) { -- 2.8.0.rc3