mbuf: rename RTE_MBUF_SCATTER_GATHER into RTE_MBUF_REFCNT

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

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 936814c..c75f442 100644 (file)
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   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
@@ -60,8 +60,6 @@
 #include <rte_random.h>
 #include <rte_cycles.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 #define MBUF_SIZE               2048
@@ -84,7 +82,7 @@
 static struct rte_mempool *pktmbuf_pool = NULL;
 static struct rte_mempool *ctrlmbuf_pool = NULL;
 
-#if defined RTE_MBUF_SCATTER_GATHER  && defined RTE_MBUF_REFCNT_ATOMIC
+#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
 
 static struct rte_mempool *refcnt_pool = NULL;
 static struct rte_ring *refcnt_mbuf_ring = NULL;
@@ -160,7 +158,7 @@ test_pktmbuf_with_non_ascii_data(void)
        memset(data, 0xff, rte_pktmbuf_pkt_len(m));
        if (!rte_pktmbuf_is_contiguous(m))
                GOTO_FAIL("Buffer should be continuous");
-       rte_pktmbuf_dump(m, MBUF_TEST_DATA_LEN);
+       rte_pktmbuf_dump(stdout, m, MBUF_TEST_DATA_LEN);
 
        rte_pktmbuf_free(m);
 
@@ -193,7 +191,7 @@ test_one_pktmbuf(void)
        if (rte_pktmbuf_pkt_len(m) != 0)
                GOTO_FAIL("Bad length");
 
-       rte_pktmbuf_dump(m, 0);
+       rte_pktmbuf_dump(stdout, m, 0);
 
        /* append data */
 
@@ -207,8 +205,8 @@ test_one_pktmbuf(void)
        memset(data, 0x66, rte_pktmbuf_pkt_len(m));
        if (!rte_pktmbuf_is_contiguous(m))
                GOTO_FAIL("Buffer should be continuous");
-       rte_pktmbuf_dump(m, MBUF_TEST_DATA_LEN);
-       rte_pktmbuf_dump(m, 2*MBUF_TEST_DATA_LEN);
+       rte_pktmbuf_dump(stdout, m, MBUF_TEST_DATA_LEN);
+       rte_pktmbuf_dump(stdout, m, 2*MBUF_TEST_DATA_LEN);
 
        /* this append should fail */
 
@@ -276,7 +274,7 @@ test_one_pktmbuf(void)
 
        rte_mbuf_sanity_check(m, RTE_MBUF_PKT, 1);
        rte_mbuf_sanity_check(m, RTE_MBUF_PKT, 0);
-       rte_pktmbuf_dump(m, 0);
+       rte_pktmbuf_dump(stdout, m, 0);
 
        /* this prepend should fail */
 
@@ -367,7 +365,7 @@ fail:
 static int
 testclone_testupdate_testdetach(void)
 {
-#ifndef RTE_MBUF_SCATTER_GATHER
+#ifndef RTE_MBUF_REFCNT
        return 0;
 #else
        struct rte_mbuf *mc = NULL;
@@ -408,7 +406,7 @@ fail:
        if (mc)
                rte_pktmbuf_free(mc);
        return -1;
-#endif /* RTE_MBUF_SCATTER_GATHER */
+#endif /* RTE_MBUF_REFCNT */
 }
 #undef GOTO_FAIL
 
@@ -441,7 +439,7 @@ test_pktmbuf_pool(void)
                printf("Error pool not empty");
                ret = -1;
        }
-#ifdef RTE_MBUF_SCATTER_GATHER
+#ifdef RTE_MBUF_REFCNT
        extra = rte_pktmbuf_clone(m[0], pktmbuf_pool);
        if(extra != NULL) {
                printf("Error pool not empty");
@@ -466,7 +464,7 @@ test_pktmbuf_pool_ptr(void)
        unsigned i;
        struct rte_mbuf *m[NB_MBUF];
        int ret = 0;
-               
+
        for (i=0; i<NB_MBUF; i++)
                m[i] = NULL;
 
@@ -485,10 +483,10 @@ test_pktmbuf_pool_ptr(void)
                if (m[i] != NULL)
                        rte_pktmbuf_free(m[i]);
        }
-       
+
        for (i=0; i<NB_MBUF; i++)
                m[i] = NULL;
-               
+
        /* alloc NB_MBUF mbufs */
        for (i=0; i<NB_MBUF; i++) {
                m[i] = rte_pktmbuf_alloc(pktmbuf_pool);
@@ -550,11 +548,11 @@ test_pktmbuf_free_segment(void)
 /*
  * Stress test for rte_mbuf atomic refcnt.
  * Implies that:
- * RTE_MBUF_SCATTER_GATHER and RTE_MBUF_REFCNT_ATOMIC are both defined.
+ * RTE_MBUF_REFCNT and RTE_MBUF_REFCNT_ATOMIC are both defined.
  * For more efficency, recomended to run with RTE_LIBRTE_MBUF_DEBUG defined.
  */
 
-#if defined RTE_MBUF_SCATTER_GATHER  && defined RTE_MBUF_REFCNT_ATOMIC
+#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
 
 static int
 test_refcnt_slave(__attribute__((unused)) void *arg)
@@ -659,7 +657,7 @@ test_refcnt_master(void)
 static int
 test_refcnt_mbuf(void)
 {
-#if defined RTE_MBUF_SCATTER_GATHER  && defined RTE_MBUF_REFCNT_ATOMIC
+#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
 
        unsigned lnum, master, slave, tref;
 
@@ -715,8 +713,8 @@ test_refcnt_mbuf(void)
                rte_panic("refernced mbufs: %u, freed mbufs: %u\n",
                          tref, refcnt_lcore[master]);
 
-       rte_mempool_dump(refcnt_pool);
-       rte_ring_dump(refcnt_mbuf_ring);
+       rte_mempool_dump(stdout, refcnt_pool);
+       rte_ring_dump(stdout, refcnt_mbuf_ring);
 
 #endif
        return (0);
@@ -810,7 +808,7 @@ test_failing_mbuf_sanity_check(void)
                return -1;
        }
 
-#ifdef RTE_MBUF_SCATTER_GATHER
+#ifdef RTE_MBUF_REFCNT
        badbuf = *buf;
        badbuf.refcnt = 0;
        if (verify_mbuf_check_panics(&badbuf)) {
@@ -831,7 +829,7 @@ test_failing_mbuf_sanity_check(void)
 #endif
 
 
-int
+static int
 test_mbuf(void)
 {
        RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != 64);
@@ -863,7 +861,7 @@ test_mbuf(void)
                printf("test_mbuf_pool() failed (2)\n");
                return -1;
        }
-       
+
        /* test that the pointer to the data on a packet mbuf is set properly */
        if (test_pktmbuf_pool_ptr() < 0) {
                printf("test_pktmbuf_pool_ptr() failed\n");
@@ -929,3 +927,9 @@ test_mbuf(void)
        }
        return 0;
 }
+
+static struct test_command mbuf_cmd = {
+       .command = "mbuf_autotest",
+       .callback = test_mbuf,
+};
+REGISTER_TEST_COMMAND(mbuf_cmd);