net/bonding: use non deprecated PCI API

[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 1c465cc..3d4a9cd 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -37,8 +37,6 @@
 #include "args.h"
 #include "init.h"
 
-#define MBUFS_PER_CLIENT 1536
-#define MBUFS_PER_PORT 1536
 #define MBUF_CACHE_SIZE 512
 
 #define RTE_MP_RX_DESC_DEFAULT 1024
@@ -63,8 +61,15 @@ struct port_info *ports;
 static int
 init_mbuf_pools(void)
 {
-       const unsigned num_mbufs = (num_clients * MBUFS_PER_CLIENT) \
-                       + (ports->num_ports * MBUFS_PER_PORT);
+       const unsigned int num_mbufs_server =
+               RTE_MP_RX_DESC_DEFAULT * ports->num_ports;
+       const unsigned int num_mbufs_client =
+               num_clients * (CLIENT_QUEUE_RINGSIZE +
+                              RTE_MP_TX_DESC_DEFAULT * ports->num_ports);
+       const unsigned int num_mbufs_mp_cache =
+               (num_clients + 1) * MBUF_CACHE_SIZE;
+       const unsigned int num_mbufs =
+               num_mbufs_server + num_mbufs_client + num_mbufs_mp_cache;
 
        /* don't pass single-producer/single-consumer flags to mbuf create as it
         * seems faster to use a cache instead */
@@ -127,7 +132,9 @@ init_port(uint16_t port_num)
                if (retval < 0) return retval;
        }
 
-       rte_eth_promiscuous_enable(port_num);
+       retval = rte_eth_promiscuous_enable(port_num);
+       if (retval < 0)
+               return retval;
 
        retval  = rte_eth_dev_start(port_num);
        if (retval < 0) return retval;
@@ -177,6 +184,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
        uint16_t portid;
        uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
+       int ret;
 
        printf("\nChecking link status");
        fflush(stdout);
@@ -186,7 +194,14 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
                        if ((port_mask & (1 << ports->id[portid])) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
-                       rte_eth_link_get_nowait(ports->id[portid], &link);
+                       ret = rte_eth_link_get_nowait(ports->id[portid], &link);
+                       if (ret < 0) {
+                               all_ports_up = 0;
+                               if (print_flag == 1)
+                                       printf("Port %u link get failed: %s\n",
+                                               portid, rte_strerror(-ret));
+                               continue;
+                       }
                        /* print link status if flag set */
                        if (print_flag == 1) {
                                if (link.link_status)
@@ -243,7 +258,7 @@ init(int argc, char *argv[])
        argv += retval;
 
        /* get total number of ports */
-       total_ports = rte_eth_dev_count();
+       total_ports = rte_eth_dev_count_total();
 
        /* set up array for port data */
        mz = rte_memzone_reserve(MZ_PORT_INFO, sizeof(*ports),