apps: use helper to create mbuf pools

[dpdk.git] / examples / qos_sched / init.c

diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
old mode 100755 (executable)
new mode 100644 (file)
index cc4c2c9..aaf3466
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -248,7 +248,7 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
 
        port_params.socket = socketid;
        port_params.rate = (uint64_t) link.link_speed * 1000 * 1000 / 8;
-       rte_snprintf(port_name, sizeof(port_name), "port_%d", portid);
+       snprintf(port_name, sizeof(port_name), "port_%d", portid);
        port_params.name = port_name;
 
        port = rte_sched_port_config(&port_params);
@@ -304,9 +304,6 @@ int app_init(void)
        char ring_name[MAX_NAME_LEN];
        char pool_name[MAX_NAME_LEN];
 
-       if (rte_eal_pci_probe() < 0)
-               rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
-
        if (rte_eth_dev_count() == 0)
                rte_exit(EXIT_FAILURE, "No Ethernet port - bye\n");
 
@@ -319,7 +316,7 @@ int app_init(void)
                uint32_t socket = rte_lcore_to_socket_id(qos_conf[i].rx_core);
                struct rte_ring *ring;
 
-               rte_snprintf(ring_name, MAX_NAME_LEN, "ring-%u-%u", i, qos_conf[i].rx_core);
+               snprintf(ring_name, MAX_NAME_LEN, "ring-%u-%u", i, qos_conf[i].rx_core);
                ring = rte_ring_lookup(ring_name);
                if (ring == NULL)
                        qos_conf[i].rx_ring = rte_ring_create(ring_name, ring_conf.ring_size,
@@ -327,7 +324,7 @@ int app_init(void)
                else
                        qos_conf[i].rx_ring = ring;
 
-               rte_snprintf(ring_name, MAX_NAME_LEN, "ring-%u-%u", i, qos_conf[i].tx_core);
+               snprintf(ring_name, MAX_NAME_LEN, "ring-%u-%u", i, qos_conf[i].tx_core);
                ring = rte_ring_lookup(ring_name);
                if (ring == NULL)
                        qos_conf[i].tx_ring = rte_ring_create(ring_name, ring_conf.ring_size,
@@ -337,14 +334,10 @@ int app_init(void)
 
 
                /* create the mbuf pools for each RX Port */
-               rte_snprintf(pool_name, MAX_NAME_LEN, "mbuf_pool%u", i);
-               qos_conf[i].mbuf_pool = rte_mempool_create(pool_name, mp_size, MBUF_SIZE,
-                                               burst_conf.rx_burst * 4,
-                                               sizeof(struct rte_pktmbuf_pool_private),
-                                               rte_pktmbuf_pool_init, NULL,
-                                               rte_pktmbuf_init, NULL,
-                                               rte_eth_dev_socket_id(qos_conf[i].rx_port),
-                                               0);
+               snprintf(pool_name, MAX_NAME_LEN, "mbuf_pool%u", i);
+               qos_conf[i].mbuf_pool = rte_pktmbuf_pool_create(pool_name,
+                       mp_size, burst_conf.rx_burst * 4, 0, MBUF_DATA_SIZE,
+                       rte_eth_dev_socket_id(qos_conf[i].rx_port));
                if (qos_conf[i].mbuf_pool == NULL)
                        rte_exit(EXIT_FAILURE, "Cannot init mbuf pool for socket %u\n", i);