apps: use helper to create mbuf pools

[dpdk.git] / examples / vmdq / main.c

diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index e60b671..7596bac 100644 (file)
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -48,7 +48,6 @@
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_launch.h>
@@ -70,8 +69,6 @@
 #include <rte_mbuf.h>
 #include <rte_memcpy.h>
 
-#include "main.h"
-
 #define MAX_QUEUES 128
 /*
  * For 10 GbE, 128 queues require roughly
@@ -79,7 +76,7 @@
  */
 #define NUM_MBUFS_PER_PORT (128*512)
 #define MBUF_CACHE_SIZE 64
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
 
 #define MAX_PKT_BURST 32
 
@@ -443,7 +440,6 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)
        ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
 }
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 /* When we receive a HUP signal, print out our stats */
 static void
 sighup_handler(int signum)
@@ -456,7 +452,6 @@ sighup_handler(int signum)
        }
        printf("\nFinished handling signal %d\n", signum);
 }
-#endif
 
 /*
  * Main thread that does the work, reading from INPUT_PORT
@@ -574,7 +569,7 @@ static unsigned check_ports_num(unsigned nb_ports)
 
 /* Main function, does initialisation and calls the per-lcore functions */
 int
-MAIN(int argc, char *argv[])
+main(int argc, char *argv[])
 {
        struct rte_mempool *mbuf_pool;
        unsigned lcore_id, core_id = 0;
@@ -582,9 +577,7 @@ MAIN(int argc, char *argv[])
        unsigned nb_ports, valid_num_ports;
        uint8_t portid;
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
        signal(SIGHUP, sighup_handler);
-#endif
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -620,12 +613,9 @@ MAIN(int argc, char *argv[])
                rte_exit(EXIT_FAILURE, "Error with valid ports number is not even or less than 2\n");
        }
 
-       mbuf_pool = rte_mempool_create("MBUF_POOL", NUM_MBUFS_PER_PORT * nb_ports,
-                                      MBUF_SIZE, MBUF_CACHE_SIZE,
-                                      sizeof(struct rte_pktmbuf_pool_private),
-                                      rte_pktmbuf_pool_init, NULL,
-                                      rte_pktmbuf_init, NULL,
-                                      rte_socket_id(), 0);
+       mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL",
+               NUM_MBUFS_PER_PORT * nb_ports, MBUF_CACHE_SIZE,
+               0, MBUF_DATA_SIZE, rte_socket_id());
        if (mbuf_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");