From patchwork Fri Jul 1 07:46:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 14486 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A0A252C30; Fri, 1 Jul 2016 09:46:52 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 370502BF7 for ; Fri, 1 Jul 2016 09:46:50 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 01 Jul 2016 00:46:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,555,1459839600"; d="scan'208";a="838530928" Received: from sie-lab-214-251.ir.intel.com (HELO silpixa373510.ir.intel.com) ([10.237.214.251]) by orsmga003.jf.intel.com with ESMTP; 01 Jul 2016 00:46:28 -0700 From: David Hunt To: dev@dpdk.org Cc: olivier.matz@6wind.com, viktorin@rehivetech.com, jerin.jacob@caviumnetworks.com, shreyansh.jain@nxp.com, David Hunt Date: Fri, 1 Jul 2016 08:46:23 +0100 Message-Id: <1467359183-5948-3-git-send-email-david.hunt@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467359183-5948-1-git-send-email-david.hunt@intel.com> References: <1467309909-123881-1-git-send-email-david.hunt@intel.com> <1467359183-5948-1-git-send-email-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v6 2/2] test: migrate custom handler test to stack handler X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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" After introducing the stack handler in the previous commit, we now have very similar code to the custom handler in test_mempool.c, which creates a custom mempool based on simple mallocs. The stack handler is a cleaner example of adding a new mempool handler, so this commit replaces the custom handler test with a stack handler test, and removes the custom handler code. Signed-off-by: David Hunt --- app/test/test_mempool.c | 117 ++++++------------------------------------------ 1 file changed, 14 insertions(+), 103 deletions(-) diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c index 63c61f3..4aec605 100644 --- a/app/test/test_mempool.c +++ b/app/test/test_mempool.c @@ -89,99 +89,6 @@ static rte_atomic32_t synchro; /* - * Simple example of custom mempool structure. Holds pointers to all the - * elements which are simply malloc'd in this example. - */ -struct custom_mempool { - rte_spinlock_t lock; - unsigned count; - unsigned size; - void *elts[]; -}; - -/* - * Loop through all the element pointers and allocate a chunk of memory, then - * insert that memory into the ring. - */ -static int -custom_mempool_alloc(struct rte_mempool *mp) -{ - struct custom_mempool *cm; - - cm = rte_zmalloc("custom_mempool", - sizeof(struct custom_mempool) + mp->size * sizeof(void *), 0); - if (cm == NULL) - return -ENOMEM; - - rte_spinlock_init(&cm->lock); - cm->count = 0; - cm->size = mp->size; - mp->pool_data = cm; - return 0; -} - -static void -custom_mempool_free(struct rte_mempool *mp) -{ - rte_free((void *)(mp->pool_data)); -} - -static int -custom_mempool_enqueue(struct rte_mempool *mp, void * const *obj_table, - unsigned n) -{ - struct custom_mempool *cm = (struct custom_mempool *)(mp->pool_data); - int ret = 0; - - rte_spinlock_lock(&cm->lock); - if (cm->count + n > cm->size) { - ret = -ENOBUFS; - } else { - memcpy(&cm->elts[cm->count], obj_table, sizeof(void *) * n); - cm->count += n; - } - rte_spinlock_unlock(&cm->lock); - return ret; -} - - -static int -custom_mempool_dequeue(struct rte_mempool *mp, void **obj_table, unsigned n) -{ - struct custom_mempool *cm = (struct custom_mempool *)(mp->pool_data); - int ret = 0; - - rte_spinlock_lock(&cm->lock); - if (n > cm->count) { - ret = -ENOENT; - } else { - cm->count -= n; - memcpy(obj_table, &cm->elts[cm->count], sizeof(void *) * n); - } - rte_spinlock_unlock(&cm->lock); - return ret; -} - -static unsigned -custom_mempool_get_count(const struct rte_mempool *mp) -{ - struct custom_mempool *cm = (struct custom_mempool *)(mp->pool_data); - - return cm->count; -} - -static struct rte_mempool_ops mempool_ops_custom = { - .name = "custom_handler", - .alloc = custom_mempool_alloc, - .free = custom_mempool_free, - .enqueue = custom_mempool_enqueue, - .dequeue = custom_mempool_dequeue, - .get_count = custom_mempool_get_count, -}; - -MEMPOOL_REGISTER_OPS(mempool_ops_custom); - -/* * save the object number in the first 4 bytes of object data. All * other bytes are set to 0. */ @@ -599,7 +506,7 @@ test_mempool(void) { struct rte_mempool *mp_cache = NULL; struct rte_mempool *mp_nocache = NULL; - struct rte_mempool *mp_ext = NULL; + struct rte_mempool *mp_stack = NULL; rte_atomic32_init(&synchro); @@ -629,25 +536,25 @@ test_mempool(void) } /* create a mempool with an external handler */ - mp_ext = rte_mempool_create_empty("test_ext", + mp_stack = rte_mempool_create_empty("test_stack", MEMPOOL_SIZE, MEMPOOL_ELT_SIZE, RTE_MEMPOOL_CACHE_MAX_SIZE, 0, SOCKET_ID_ANY, 0); - if (mp_ext == NULL) { - printf("cannot allocate mp_ext mempool\n"); + if (mp_stack == NULL) { + printf("cannot allocate mp_stack mempool\n"); goto err; } - if (rte_mempool_set_ops_byname(mp_ext, "custom_handler", NULL) < 0) { - printf("cannot set custom handler\n"); + if (rte_mempool_set_ops_byname(mp_stack, "stack", NULL) < 0) { + printf("cannot set stack handler\n"); goto err; } - if (rte_mempool_populate_default(mp_ext) < 0) { - printf("cannot populate mp_ext mempool\n"); + if (rte_mempool_populate_default(mp_stack) < 0) { + printf("cannot populate mp_stack mempool\n"); goto err; } - rte_mempool_obj_iter(mp_ext, my_obj_init, NULL); + rte_mempool_obj_iter(mp_stack, my_obj_init, NULL); /* retrieve the mempool from its name */ if (rte_mempool_lookup("test_nocache") != mp_nocache) { @@ -686,14 +593,18 @@ test_mempool(void) if (test_mempool_xmem_misc() < 0) goto err; + /* test the stack handler */ + if (test_mempool_basic(mp_stack, 1) < 0) + goto err; + rte_mempool_list_dump(stdout); return 0; err: + rte_mempool_free(mp_stack); rte_mempool_free(mp_nocache); rte_mempool_free(mp_cache); - rte_mempool_free(mp_ext); return -1; }