tailq: remove unneeded inclusions

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

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 280b1ab..1ff66cb 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>
@@ -81,7 +80,7 @@
 
 static struct rte_mempool *pktmbuf_pool = NULL;
 
-#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
+#ifdef RTE_MBUF_REFCNT_ATOMIC
 
 static struct rte_mempool *refcnt_pool = NULL;
 static struct rte_ring *refcnt_mbuf_ring = NULL;
@@ -322,9 +321,6 @@ fail:
 static int
 testclone_testupdate_testdetach(void)
 {
-#ifndef RTE_MBUF_REFCNT
-       return 0;
-#else
        struct rte_mbuf *mc = NULL;
        struct rte_mbuf *clone = NULL;
 
@@ -344,8 +340,8 @@ testclone_testupdate_testdetach(void)
                GOTO_FAIL("cannot clone data\n");
        rte_pktmbuf_free(clone);
 
-       mc->pkt.next = rte_pktmbuf_alloc(pktmbuf_pool);
-       if(mc->pkt.next == NULL)
+       mc->next = rte_pktmbuf_alloc(pktmbuf_pool);
+       if(mc->next == NULL)
                GOTO_FAIL("Next Pkt Null\n");
 
        clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
@@ -363,7 +359,6 @@ fail:
        if (mc)
                rte_pktmbuf_free(mc);
        return -1;
-#endif /* RTE_MBUF_REFCNT */
 }
 #undef GOTO_FAIL
 
@@ -396,13 +391,11 @@ test_pktmbuf_pool(void)
                printf("Error pool not empty");
                ret = -1;
        }
-#ifdef RTE_MBUF_REFCNT
        extra = rte_pktmbuf_clone(m[0], pktmbuf_pool);
        if(extra != NULL) {
                printf("Error pool not empty");
                ret = -1;
        }
-#endif
        /* free them */
        for (i=0; i<NB_MBUF; i++) {
                if (m[i] != NULL)
@@ -432,7 +425,7 @@ test_pktmbuf_pool_ptr(void)
                        printf("rte_pktmbuf_alloc() failed (%u)\n", i);
                        ret = -1;
                }
-               m[i]->pkt.data = RTE_PTR_ADD(m[i]->pkt.data, 64);
+               m[i]->data_off += 64;
        }
 
        /* free them */
@@ -451,8 +444,8 @@ test_pktmbuf_pool_ptr(void)
                        printf("rte_pktmbuf_alloc() failed (%u)\n", i);
                        ret = -1;
                }
-               if (m[i]->pkt.data != RTE_PTR_ADD(m[i]->buf_addr, RTE_PKTMBUF_HEADROOM)) {
-                       printf ("pkt.data pointer not set properly\n");
+               if (m[i]->data_off != RTE_PKTMBUF_HEADROOM) {
+                       printf("invalid data_off\n");
                        ret = -1;
                }
        }
@@ -493,7 +486,7 @@ test_pktmbuf_free_segment(void)
                        mb = m[i];
                        while(mb != NULL) {
                                mt = mb;
-                               mb = mb->pkt.next;
+                               mb = mb->next;
                                rte_pktmbuf_free_seg(mt);
                        }
                }
@@ -504,12 +497,11 @@ test_pktmbuf_free_segment(void)
 
 /*
  * Stress test for rte_mbuf atomic refcnt.
- * Implies that:
- * RTE_MBUF_REFCNT and RTE_MBUF_REFCNT_ATOMIC are both defined.
+ * Implies that RTE_MBUF_REFCNT_ATOMIC is defined.
  * For more efficency, recomended to run with RTE_LIBRTE_MBUF_DEBUG defined.
  */
 
-#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
+#ifdef RTE_MBUF_REFCNT_ATOMIC
 
 static int
 test_refcnt_slave(__attribute__((unused)) void *arg)
@@ -614,7 +606,7 @@ test_refcnt_master(void)
 static int
 test_refcnt_mbuf(void)
 {
-#if defined RTE_MBUF_REFCNT  && defined RTE_MBUF_REFCNT_ATOMIC
+#ifdef RTE_MBUF_REFCNT_ATOMIC
 
        unsigned lnum, master, slave, tref;
 
@@ -677,21 +669,10 @@ test_refcnt_mbuf(void)
        return (0);
 }
 
-#ifdef RTE_EXEC_ENV_BAREMETAL
-
-/* baremetal - don't test failing sanity checks */
-static int
-test_failing_mbuf_sanity_check(void)
-{
-       return 0;
-}
-
-#else
-
 #include <unistd.h>
 #include <sys/wait.h>
 
-/* linuxapp - use fork() to test mbuf errors panic */
+/* use fork() to test mbuf errors panic */
 static int
 verify_mbuf_check_panics(struct rte_mbuf *buf)
 {
@@ -758,7 +739,6 @@ test_failing_mbuf_sanity_check(void)
                return -1;
        }
 
-#ifdef RTE_MBUF_REFCNT
        badbuf = *buf;
        badbuf.refcnt = 0;
        if (verify_mbuf_check_panics(&badbuf)) {
@@ -772,17 +752,15 @@ test_failing_mbuf_sanity_check(void)
                printf("Error with bad-refcnt(MAX) mbuf test\n");
                return -1;
        }
-#endif
 
        return 0;
 }
-#endif
 
 
 static int
 test_mbuf(void)
 {
-       RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != 64);
+       RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) != RTE_CACHE_LINE_SIZE * 2);
 
        /* create pktmbuf pool if it does not exist */
        if (pktmbuf_pool == NULL) {