examples: numa updates

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

diff --git a/examples/ipv4_frag/main.c b/examples/ipv4_frag/main.c
index cc1e51b..a9d1705 100644 (file)
--- a/examples/ipv4_frag/main.c
+++ b/examples/ipv4_frag/main.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -115,8 +115,6 @@
 #define MAX_PKT_BURST  32
 #define BURST_TX_DRAIN 200000ULL /* around 100us at 2 Ghz */
 
-#define SOCKET0 0
-
 /* Configure how many packets ahead to prefetch, when reading packets */
 #define PREFETCH_OFFSET        3
 
@@ -167,7 +165,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 
@@ -312,7 +310,7 @@ static __attribute__((noreturn)) int
 main_loop(__attribute__((unused)) void *dummy)
 {
        struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
-       uint32_t lcore_id;
+       unsigned lcore_id;
        uint64_t prev_tsc = 0;
        uint64_t diff_tsc, cur_tsc;
        int i, j, nb_rx;
@@ -597,7 +595,7 @@ MAIN(int argc, char **argv)
                                   sizeof(struct rte_pktmbuf_pool_private),
                                   rte_pktmbuf_pool_init, NULL,
                                   rte_pktmbuf_init, NULL,
-                                  SOCKET0, 0);
+                                  rte_socket_id(), 0);
        if (pool_direct == NULL)
                rte_panic("Cannot init direct mbuf pool\n");
 
@@ -607,7 +605,7 @@ MAIN(int argc, char **argv)
                                   0,
                                   NULL, NULL,
                                   rte_pktmbuf_init, NULL,
-                                  SOCKET0, 0);
+                                  rte_socket_id(), 0);
        if (pool_indirect == NULL)
                rte_panic("Cannot init indirect mbuf pool\n");
 
@@ -639,10 +637,10 @@ MAIN(int argc, char **argv)
                       qconf->n_rx_queue == (unsigned)rx_queue_per_lcore) {
 
                        rx_lcore_id ++;
-                       qconf = &lcore_queue_conf[rx_lcore_id];
-
                        if (rx_lcore_id >= RTE_MAX_LCORE)
                                rte_exit(EXIT_FAILURE, "Not enough cores\n");
+
+                       qconf = &lcore_queue_conf[rx_lcore_id];
                }
                qconf->rx_queue_list[qconf->n_rx_queue] = portid;
                qconf->n_rx_queue++;
@@ -671,7 +669,7 @@ MAIN(int argc, char **argv)
                printf("rxq=%d ", queueid);
                fflush(stdout);
                ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
-                                            SOCKET0, &rx_conf,
+                                            rte_eth_dev_socket_id(portid), &rx_conf,
                                             pool_direct);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
@@ -686,7 +684,7 @@ MAIN(int argc, char **argv)
                        printf("txq=%u,%d ", lcore_id, queueid);
                        fflush(stdout);
                        ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
-                                                    SOCKET0, &tx_conf);
+                                                    rte_eth_dev_socket_id(portid), &tx_conf);
                        if (ret < 0)
                                rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
                                        "err=%d, port=%d\n", ret, portid);
@@ -712,7 +710,7 @@ MAIN(int argc, char **argv)
        check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask);
 
        /* create the LPM table */
-       l3fwd_lpm = rte_lpm_create("L3FWD_LPM", SOCKET0, L3FWD_LPM_MAX_RULES, 0);
+       l3fwd_lpm = rte_lpm_create("L3FWD_LPM", rte_socket_id(), L3FWD_LPM_MAX_RULES, 0);
        if (l3fwd_lpm == NULL)
                rte_panic("Unable to create the l3fwd LPM table\n");
 
@@ -729,7 +727,7 @@ MAIN(int argc, char **argv)
                }
 
                printf("Adding route 0x%08x / %d (%d)\n",
-                       l3fwd_route_array[i].ip,
+                       (unsigned) l3fwd_route_array[i].ip,
                        l3fwd_route_array[i].depth,
                        l3fwd_route_array[i].if_out);
        }