mempool: store memory chunks in a list

[dpdk.git] / app / test / test_mempool.c

diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index a83b2ee..2bc3ac0 100644 (file)
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -47,7 +47,6 @@
 #include <rte_memzone.h>
 #include <rte_launch.h>
 #include <rte_cycles.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -76,7 +75,7 @@
 #define TIME_S 5
 #define MEMPOOL_ELT_SIZE 2048
 #define MAX_KEEP 128
-#define MEMPOOL_SIZE ((RTE_MAX_LCORE*(MAX_KEEP+RTE_MEMPOOL_CACHE_MAX_SIZE))-1)
+#define MEMPOOL_SIZE ((rte_lcore_count()*(MAX_KEEP+RTE_MEMPOOL_CACHE_MAX_SIZE))-1)
 
 static struct rte_mempool *mp;
 static struct rte_mempool *mp_cache, *mp_nocache;
@@ -123,16 +122,15 @@ test_mempool_basic(void)
                return -1;
 
        printf("get private data\n");
-       if (rte_mempool_get_priv(mp) !=
-                       (char*) mp + MEMPOOL_HEADER_SIZE(mp, mp->pg_num))
+       if (rte_mempool_get_priv(mp) != (char *)mp +
+                       MEMPOOL_HEADER_SIZE(mp, 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);
@@ -360,7 +358,7 @@ test_mempool_basic_ex(struct rte_mempool * mp)
        if (mp == NULL)
                return ret;
 
-       obj = (void **)rte_zmalloc("test_mempool_basic_ex", (MEMPOOL_SIZE * sizeof(void *)), 0);
+       obj = rte_calloc("test_mempool_basic_ex", MEMPOOL_SIZE , sizeof(void *), 0);
        if (obj == NULL) {
                printf("test_mempool_basic_ex fail to rte_malloc\n");
                return ret;
@@ -449,13 +447,13 @@ test_mempool_xmem_misc(void)
                printf("failure @ %s: rte_mempool_xmem_usage(%u, %u) "
                        "returns: %#zx, while expected: %#zx;\n",
                        __func__, elt_num, total_size, sz, (size_t)usz);
-               return (-1);
+               return -1;
        }
 
-       return (0);
+       return 0;
 }
 
-int
+static int
 test_mempool(void)
 {
        rte_atomic32_init(&synchro);
@@ -521,3 +519,9 @@ test_mempool(void)
 
        return 0;
 }
+
+static struct test_command mempool_cmd = {
+       .command = "mempool_autotest",
+       .callback = test_mempool,
+};
+REGISTER_TEST_COMMAND(mempool_cmd);