remove extra parentheses in return statement

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

diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index 1195804..f0f823b 100644 (file)
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -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>
@@ -58,8 +57,6 @@
 #include <rte_spinlock.h>
 #include <rte_malloc.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*
@@ -78,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;
@@ -112,12 +109,12 @@ test_mempool_basic(void)
        unsigned i, j;
 
        /* dump the mempool status */
-       rte_mempool_dump(mp);
+       rte_mempool_dump(stdout, mp);
 
        printf("get an object\n");
        if (rte_mempool_get(mp, &obj) < 0)
                return -1;
-       rte_mempool_dump(mp);
+       rte_mempool_dump(stdout, mp);
 
        /* tests that improve coverage */
        printf("get object count\n");
@@ -126,17 +123,19 @@ test_mempool_basic(void)
 
        printf("get private data\n");
        if (rte_mempool_get_priv(mp) !=
-                       (char*) mp + sizeof(struct rte_mempool))
+                       (char*) mp + MEMPOOL_HEADER_SIZE(mp, mp->pg_num))
                return -1;
 
        printf("get physical address of an object\n");
-       if (rte_mempool_virt2phy(mp, obj) !=
-                       (phys_addr_t) (mp->phys_addr + (phys_addr_t) ((char*) obj - (char*) mp)))
+       if (MEMPOOL_IS_CONTIG(mp) &&
+                       rte_mempool_virt2phy(mp, obj) !=
+                       (phys_addr_t) (mp->phys_addr +
+                       (phys_addr_t) ((char*) obj - (char*) mp)))
                return -1;
 
        printf("put the object back\n");
        rte_mempool_put(mp, obj);
-       rte_mempool_dump(mp);
+       rte_mempool_dump(stdout, mp);
 
        printf("get 2 objects\n");
        if (rte_mempool_get(mp, &obj) < 0)
@@ -145,12 +144,12 @@ test_mempool_basic(void)
                rte_mempool_put(mp, obj);
                return -1;
        }
-       rte_mempool_dump(mp);
+       rte_mempool_dump(stdout, mp);
 
        printf("put the objects back\n");
        rte_mempool_put(mp, obj);
        rte_mempool_put(mp, obj2);
-       rte_mempool_dump(mp);
+       rte_mempool_dump(stdout, mp);
 
        /*
         * get many objects: we cannot get them all because the cache
@@ -360,7 +359,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;
@@ -428,7 +427,34 @@ test_mempool_same_name_twice_creation(void)
        return 0;
 }
 
-int
+/*
+ * BAsic test for mempool_xmem functions.
+ */
+static int
+test_mempool_xmem_misc(void)
+{
+       uint32_t elt_num, total_size;
+       size_t sz;
+       ssize_t usz;
+
+       elt_num = MAX_KEEP;
+       total_size = rte_mempool_calc_obj_size(MEMPOOL_ELT_SIZE, 0, NULL);
+       sz = rte_mempool_xmem_size(elt_num, total_size, MEMPOOL_PG_SHIFT_MAX);
+
+       usz = rte_mempool_xmem_usage(NULL, elt_num, total_size, 0, 1,
+               MEMPOOL_PG_SHIFT_MAX);
+
+       if(sz != (size_t)usz)  {
+               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 0;
+}
+
+static int
 test_mempool(void)
 {
        rte_atomic32_init(&synchro);
@@ -461,7 +487,7 @@ test_mempool(void)
                return -1;
        }
 
-       rte_mempool_list_dump();
+       rte_mempool_list_dump(stdout);
 
        /* basic tests without cache */
        mp = mp_nocache;
@@ -487,7 +513,16 @@ test_mempool(void)
        if (test_mempool_same_name_twice_creation() < 0)
                return -1;
 
-       rte_mempool_list_dump();
+       if (test_mempool_xmem_misc() < 0)
+               return -1;
+
+       rte_mempool_list_dump(stdout);
 
        return 0;
 }
+
+static struct test_command mempool_cmd = {
+       .command = "mempool_autotest",
+       .callback = test_mempool,
+};
+REGISTER_TEST_COMMAND(mempool_cmd);