app/test: rename mbuf variable

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

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 9de6dea..2614598 100644 (file)
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -48,7 +48,6 @@
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -62,7 +61,7 @@
 
 #include "test.h"
 
-#define MBUF_SIZE               2048
+#define MBUF_DATA_SIZE          2048
 #define NB_MBUF                 128
 #define MBUF_TEST_DATA_LEN      1464
 #define MBUF_TEST_DATA_LEN2     50
@@ -74,7 +73,6 @@
 #define REFCNT_MAX_TIMEOUT      10
 #define REFCNT_MAX_REF          (RTE_MAX_LCORE)
 #define REFCNT_MBUF_NUM         64
-#define REFCNT_MBUF_SIZE        (sizeof (struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define REFCNT_RING_SIZE        (REFCNT_MBUF_NUM * REFCNT_MAX_REF)
 
 #define MAKE_STRING(x)          # x
@@ -322,43 +320,42 @@ fail:
 static int
 testclone_testupdate_testdetach(void)
 {
-       struct rte_mbuf *mc = NULL;
+       struct rte_mbuf *m = NULL;
        struct rte_mbuf *clone = NULL;
 
        /* alloc a mbuf */
-
-       mc = rte_pktmbuf_alloc(pktmbuf_pool);
-       if (mc == NULL)
+       m = rte_pktmbuf_alloc(pktmbuf_pool);
+       if (m == NULL)
                GOTO_FAIL("ooops not allocating mbuf");
 
-       if (rte_pktmbuf_pkt_len(mc) != 0)
+       if (rte_pktmbuf_pkt_len(m) != 0)
                GOTO_FAIL("Bad length");
 
 
        /* clone the allocated mbuf */
-       clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
+       clone = rte_pktmbuf_clone(m, pktmbuf_pool);
        if (clone == NULL)
                GOTO_FAIL("cannot clone data\n");
        rte_pktmbuf_free(clone);
 
-       mc->next = rte_pktmbuf_alloc(pktmbuf_pool);
-       if(mc->next == NULL)
+       m->next = rte_pktmbuf_alloc(pktmbuf_pool);
+       if (m->next == NULL)
                GOTO_FAIL("Next Pkt Null\n");
 
-       clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
+       clone = rte_pktmbuf_clone(m, pktmbuf_pool);
        if (clone == NULL)
                GOTO_FAIL("cannot clone data\n");
 
        /* free mbuf */
-       rte_pktmbuf_free(mc);
+       rte_pktmbuf_free(m);
        rte_pktmbuf_free(clone);
-       mc = NULL;
+       m = NULL;
        clone = NULL;
        return 0;
 
 fail:
-       if (mc)
-               rte_pktmbuf_free(mc);
+       if (m)
+               rte_pktmbuf_free(m);
        return -1;
 }
 #undef GOTO_FAIL
@@ -623,12 +620,10 @@ test_refcnt_mbuf(void)
        /* create refcnt pool & ring if they don't exist */
 
        if (refcnt_pool == NULL &&
-                       (refcnt_pool = rte_mempool_create(
-                       MAKE_STRING(refcnt_pool),
-                       REFCNT_MBUF_NUM, REFCNT_MBUF_SIZE, 0,
-                       sizeof(struct rte_pktmbuf_pool_private),
-                       rte_pktmbuf_pool_init, NULL, rte_pktmbuf_init, NULL,
-                       SOCKET_ID_ANY, 0)) == NULL) {
+                       (refcnt_pool = rte_pktmbuf_pool_create(
+                               MAKE_STRING(refcnt_pool),
+                               REFCNT_MBUF_NUM, 0, 0, 0,
+                               SOCKET_ID_ANY)) == NULL) {
                printf("%s: cannot allocate " MAKE_STRING(refcnt_pool) "\n",
                    __func__);
                return (-1);
@@ -765,13 +760,8 @@ test_mbuf(void)
 
        /* create pktmbuf pool if it does not exist */
        if (pktmbuf_pool == NULL) {
-               pktmbuf_pool =
-                       rte_mempool_create("test_pktmbuf_pool", NB_MBUF,
-                                          MBUF_SIZE, 32,
-                                          sizeof(struct rte_pktmbuf_pool_private),
-                                          rte_pktmbuf_pool_init, NULL,
-                                          rte_pktmbuf_init, NULL,
-                                          SOCKET_ID_ANY, 0);
+               pktmbuf_pool = rte_pktmbuf_pool_create("test_pktmbuf_pool",
+                       NB_MBUF, 32, 0, MBUF_DATA_SIZE, SOCKET_ID_ANY);
        }
 
        if (pktmbuf_pool == NULL) {