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/eventdev_pipeline/pipeline_worker_generic.c | 6 +++--- examples/eventdev_pipeline/pipeline_worker_tx.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/eventdev_pipeline/pipeline_worker_generic.c b/examples/eventdev_pipeline/pipeline_worker_generic.c index 77d9d91043..47669bf66c 100644 --- a/examples/eventdev_pipeline/pipeline_worker_generic.c +++ b/examples/eventdev_pipeline/pipeline_worker_generic.c @@ -357,7 +357,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) /* Allocate and set up 1 RX queue per Ethernet port. */ for (q = 0; q < rx_rings; q++) { retval = rte_eth_rx_queue_setup(port, q, rx_ring_size, - rte_eth_dev_socket_id(port), &rx_conf, + rte_eth_dev_numa_id(port), &rx_conf, mbuf_pool); if (retval < 0) return retval; @@ -368,7 +368,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) /* Allocate and set up 1 TX queue per Ethernet port. */ for (q = 0; q < tx_rings; q++) { retval = rte_eth_tx_queue_setup(port, q, tx_ring_size, - rte_eth_dev_socket_id(port), &txconf); + rte_eth_dev_numa_id(port), &txconf); if (retval < 0) return retval; } @@ -407,7 +407,7 @@ init_ports(uint16_t num_ports) /* cache_size */ 512, /* priv_size*/ 0, /* data_room_size */ RTE_MBUF_DEFAULT_BUF_SIZE, - rte_socket_id()); + rte_numa_id()); RTE_ETH_FOREACH_DEV(portid) if (port_init(portid, mp) != 0) diff --git a/examples/eventdev_pipeline/pipeline_worker_tx.c b/examples/eventdev_pipeline/pipeline_worker_tx.c index 174976a1b5..fae9481f56 100644 --- a/examples/eventdev_pipeline/pipeline_worker_tx.c +++ b/examples/eventdev_pipeline/pipeline_worker_tx.c @@ -702,7 +702,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) /* Allocate and set up 1 RX queue per Ethernet port. */ for (q = 0; q < rx_rings; q++) { retval = rte_eth_rx_queue_setup(port, q, rx_ring_size, - rte_eth_dev_socket_id(port), &rx_conf, + rte_eth_dev_numa_id(port), &rx_conf, mbuf_pool); if (retval < 0) return retval; @@ -713,7 +713,7 @@ port_init(uint8_t port, struct rte_mempool *mbuf_pool) /* Allocate and set up 1 TX queue per Ethernet port. */ for (q = 0; q < tx_rings; q++) { retval = rte_eth_tx_queue_setup(port, q, tx_ring_size, - rte_eth_dev_socket_id(port), &txconf); + rte_eth_dev_numa_id(port), &txconf); if (retval < 0) return retval; } @@ -752,7 +752,7 @@ init_ports(uint16_t num_ports) /* cache_size */ 512, /* priv_size*/ 0, /* data_room_size */ RTE_MBUF_DEFAULT_BUF_SIZE, - rte_socket_id()); + rte_numa_id()); RTE_ETH_FOREACH_DEV(portid) if (port_init(portid, mp) != 0) -- 2.55.0
