apps: use helper to create mbuf pools

[dpdk.git] / examples / multi_process / client_server_mp / mp_server / init.c

diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 0ed8d18..dc3647d 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.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
@@ -42,7 +42,6 @@
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_byteorder.h>
 #include <rte_atomic.h>
@@ -66,17 +65,13 @@
 #include <rte_cycles.h>
 
 #include "common.h"
-#include "init_drivers.h"
 #include "args.h"
 #include "init.h"
-#include "main.h"
 
 #define MBUFS_PER_CLIENT 1536
 #define MBUFS_PER_PORT 1536
 #define MBUF_CACHE_SIZE 512
-#define MBUF_OVERHEAD (sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
-#define RX_MBUF_DATA_SIZE 2048
-#define MBUF_SIZE (RX_MBUF_DATA_SIZE + MBUF_OVERHEAD)
+#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
 
 #define RTE_MP_RX_DESC_DEFAULT 512
 #define RTE_MP_TX_DESC_DEFAULT 512
@@ -84,41 +79,6 @@
 
 #define NO_FLAGS 0
 
-/*
- * RX and TX Prefetch, Host, and Write-back threshold values should be
- * carefully set for optimal performance. Consult the network
- * controller's datasheet and supporting DPDK documentation for guidance
- * on how these parameters should be set.
- */
-/* Default configuration for rx and tx thresholds etc. */
-/*
- * These default values are optimized for use with the Intel(R) 82599 10 GbE
- * Controller and the DPDK ixgbe PMD. Consider using other values for other
- * network controllers and/or network drivers.
- */
-#define MP_DEFAULT_PTHRESH 36
-#define MP_DEFAULT_RX_HTHRESH 8
-#define MP_DEFAULT_TX_HTHRESH 0
-#define MP_DEFAULT_WTHRESH 0
-
-static const struct rte_eth_rxconf rx_conf_default = {
-               .rx_thresh = {
-                               .pthresh = MP_DEFAULT_PTHRESH,
-                               .hthresh = MP_DEFAULT_RX_HTHRESH,
-                               .wthresh = MP_DEFAULT_WTHRESH,
-               },
-};
-
-static const struct rte_eth_txconf tx_conf_default = {
-               .tx_thresh = {
-                               .pthresh = MP_DEFAULT_PTHRESH,
-                               .hthresh = MP_DEFAULT_TX_HTHRESH,
-                               .wthresh = MP_DEFAULT_WTHRESH,
-               },
-               .tx_free_thresh = 0, /* Use PMD default values */
-               .tx_rs_thresh = 0, /* Use PMD default values */
-};
-
 /* The mbuf pool for packet rx */
 struct rte_mempool *pktmbuf_pool;
 
@@ -142,10 +102,8 @@ init_mbuf_pools(void)
         * seems faster to use a cache instead */
        printf("Creating mbuf pool '%s' [%u mbufs] ...\n",
                        PKTMBUF_POOL_NAME, num_mbufs);
-       pktmbuf_pool = rte_mempool_create(PKTMBUF_POOL_NAME, num_mbufs,
-                       MBUF_SIZE, MBUF_CACHE_SIZE,
-                       sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init,
-                       NULL, rte_pktmbuf_init, NULL, rte_socket_id(), NO_FLAGS );
+       pktmbuf_pool = rte_pktmbuf_pool_create(PKTMBUF_POOL_NAME, num_mbufs,
+               MBUF_CACHE_SIZE, 0, MBUF_DATA_SIZE, rte_socket_id());
 
        return (pktmbuf_pool == NULL); /* 0  on success */
 }
@@ -184,13 +142,15 @@ init_port(uint8_t port_num)
 
        for (q = 0; q < rx_rings; q++) {
                retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size,
-                               rte_eth_dev_socket_id(port_num), &rx_conf_default, pktmbuf_pool);
+                               rte_eth_dev_socket_id(port_num),
+                               NULL, pktmbuf_pool);
                if (retval < 0) return retval;
        }
 
        for ( q = 0; q < tx_rings; q ++ ) {
                retval = rte_eth_tx_queue_setup(port_num, q, tx_ring_size,
-                               rte_eth_dev_socket_id(port_num), &tx_conf_default);
+                               rte_eth_dev_socket_id(port_num),
+                               NULL);
                if (retval < 0) return retval;
        }
 
@@ -308,11 +268,6 @@ init(int argc, char *argv[])
        argc -= retval;
        argv += retval;
 
-       /* initialise the nic drivers */
-       retval = init_drivers();
-       if (retval != 0)
-               rte_exit(EXIT_FAILURE, "Cannot initialise drivers\n");
-
        /* get total number of ports */
        total_ports = rte_eth_dev_count();