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/ipv4_multicast/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index 1cb621cb8b..4f31cd9d77 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -124,7 +124,7 @@ static struct rte_fbk_hash_params mcast_hash_params = { .name = "MCAST_HASH", .entries = 1024, .entries_per_bucket = 4, - .socket_id = 0, + .numa_id = 0, .hash_func = NULL, .init_val = 0, }; @@ -560,7 +560,7 @@ init_mcast_hash(void) { uint32_t i; - mcast_hash_params.socket_id = rte_socket_id(); + mcast_hash_params.numa_id = rte_numa_id(); mcast_hash = rte_fbk_hash_create(&mcast_hash_params); if (mcast_hash == NULL){ return -1; @@ -665,19 +665,19 @@ main(int argc, char **argv) /* Create the mbuf pools. 8< */ packet_pool = rte_pktmbuf_pool_create("packet_pool", NB_PKT_MBUF, 32, - 0, PKT_MBUF_DATA_SIZE, rte_socket_id()); + 0, PKT_MBUF_DATA_SIZE, rte_numa_id()); if (packet_pool == NULL) rte_exit(EXIT_FAILURE, "Cannot init packet mbuf pool\n"); header_pool = rte_pktmbuf_pool_create("header_pool", NB_HDR_MBUF, 32, - 0, HDR_MBUF_DATA_SIZE, rte_socket_id()); + 0, HDR_MBUF_DATA_SIZE, rte_numa_id()); if (header_pool == NULL) rte_exit(EXIT_FAILURE, "Cannot init header mbuf pool\n"); clone_pool = rte_pktmbuf_pool_create("clone_pool", NB_CLONE_MBUF, 32, - 0, 0, rte_socket_id()); + 0, 0, rte_numa_id()); if (clone_pool == NULL) rte_exit(EXIT_FAILURE, "Cannot init clone mbuf pool\n"); @@ -764,7 +764,7 @@ main(int argc, char **argv) rxq_conf = dev_info.default_rxconf; rxq_conf.offloads = local_port_conf.rxmode.offloads; ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd, - rte_eth_dev_socket_id(portid), + rte_eth_dev_numa_id(portid), &rxq_conf, packet_pool); if (ret < 0) @@ -783,7 +783,7 @@ main(int argc, char **argv) txconf = &dev_info.default_txconf; txconf->offloads = local_port_conf.txmode.offloads; ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd, - rte_lcore_to_socket_id(lcore_id), txconf); + rte_lcore_to_numa_id(lcore_id), txconf); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, " "port=%d\n", ret, portid); -- 2.55.0
