From: Chengwen Feng <[email protected]> Rename socket_id parameters, internal structure fields, variables and comments to the NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <[email protected]> --- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd_ops.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/compress/zlib/zlib_pmd.c b/drivers/compress/zlib/zlib_pmd.c index ed3905484c..6943367b6f 100644 --- a/drivers/compress/zlib/zlib_pmd.c +++ b/drivers/compress/zlib/zlib_pmd.c @@ -535,7 +535,7 @@ zlib_probe(struct rte_vdev_device *vdev) { struct rte_compressdev_pmd_init_params init_params = { "", - rte_socket_id() + rte_numa_id() }; const char *name; const char *input_args; diff --git a/drivers/compress/zlib/zlib_pmd_ops.c b/drivers/compress/zlib/zlib_pmd_ops.c index fb9cec8488..e240db25f4 100644 --- a/drivers/compress/zlib/zlib_pmd_ops.c +++ b/drivers/compress/zlib/zlib_pmd_ops.c @@ -155,7 +155,7 @@ zlib_pmd_qp_set_unique_name(struct rte_compressdev *dev, /** Create a ring to place process packets on */ static struct rte_ring * zlib_pmd_qp_create_processed_pkts_ring(struct zlib_qp *qp, - unsigned int ring_size, int socket_id) + unsigned int ring_size, int numa_id) { struct rte_ring *r = qp->processed_pkts; @@ -171,14 +171,14 @@ zlib_pmd_qp_create_processed_pkts_ring(struct zlib_qp *qp, return NULL; } - return rte_ring_create(qp->name, ring_size, socket_id, + return rte_ring_create(qp->name, ring_size, numa_id, RING_F_EXACT_SZ); } /** Setup a queue pair */ static int zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, - uint32_t max_inflight_ops, int socket_id) + uint32_t max_inflight_ops, int numa_id) { struct zlib_qp *qp = NULL; @@ -187,8 +187,8 @@ zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, zlib_pmd_qp_release(dev, qp_id); /* Allocate the queue pair data structure. */ - qp = rte_zmalloc_socket("ZLIB PMD Queue Pair", sizeof(*qp), - RTE_CACHE_LINE_SIZE, socket_id); + qp = rte_zmalloc_numa("ZLIB PMD Queue Pair", sizeof(*qp), + RTE_CACHE_LINE_SIZE, numa_id); if (qp == NULL) return (-ENOMEM); @@ -199,7 +199,7 @@ zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, goto qp_setup_cleanup; qp->processed_pkts = zlib_pmd_qp_create_processed_pkts_ring(qp, - max_inflight_ops, socket_id); + max_inflight_ops, numa_id); if (qp->processed_pkts == NULL) goto qp_setup_cleanup; -- 2.55.0
