From: Chengwen Feng <[email protected]>

Rename socket_id parameters, local variables and comments to the
NUMA node terminology, and switch calls to the NUMA-named APIs.

Signed-off-by: Chengwen Feng <[email protected]>
---
 examples/bond/main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 99359cd6fb..ef1b074f37 100644
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -166,7 +166,7 @@ member_port_init(uint16_t portid)
        rxq_conf = dev_info.default_rxconf;
        rxq_conf.offloads = local_port_conf.rxmode.offloads;
        retval = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
-                                       rte_eth_dev_socket_id(portid),
+                                       rte_eth_dev_numa_id(portid),
                                        &rxq_conf,
                                        mbuf_pool);
        if (retval < 0)
@@ -177,7 +177,7 @@ member_port_init(uint16_t portid)
        txq_conf = dev_info.default_txconf;
        txq_conf.offloads = local_port_conf.txmode.offloads;
        retval = rte_eth_tx_queue_setup(portid, 0, nb_txd,
-                               rte_eth_dev_socket_id(portid), &txq_conf);
+                               rte_eth_dev_numa_id(portid), &txq_conf);
 
        if (retval < 0)
                rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)",
@@ -216,7 +216,7 @@ bond_port_init(void)
        uint16_t wait_counter = 20;
 
        retval = rte_eth_bond_create("net_bonding0", BONDING_MODE_ALB,
-                       0 /*SOCKET_ID_ANY*/);
+                       0 /*RTE_NUMA_ID_ANY*/);
        if (retval < 0)
                rte_exit(EXIT_FAILURE,
                                "Failed to create bond port\n");
@@ -253,7 +253,7 @@ bond_port_init(void)
        rxq_conf = dev_info.default_rxconf;
        rxq_conf.offloads = local_port_conf.rxmode.offloads;
        retval = rte_eth_rx_queue_setup(BOND_PORT, 0, nb_rxd,
-                                       rte_eth_dev_socket_id(BOND_PORT),
+                                       rte_eth_dev_numa_id(BOND_PORT),
                                        &rxq_conf, mbuf_pool);
        if (retval < 0)
                rte_exit(retval, " port %u: RX queue 0 setup failed (res=%d)",
@@ -263,7 +263,7 @@ bond_port_init(void)
        txq_conf = dev_info.default_txconf;
        txq_conf.offloads = local_port_conf.txmode.offloads;
        retval = rte_eth_tx_queue_setup(BOND_PORT, 0, nb_txd,
-                               rte_eth_dev_socket_id(BOND_PORT), &txq_conf);
+                               rte_eth_dev_numa_id(BOND_PORT), &txq_conf);
 
        if (retval < 0)
                rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)",
@@ -698,7 +698,7 @@ main(int argc, char *argv[])
                rte_exit(EXIT_FAILURE, "You can have max 4 ports\n");
 
        mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NB_MBUF, 32,
-               0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
+               0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_numa_id());
        if (mbuf_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
 
-- 
2.55.0

Reply via email to