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/raw/skeleton/skeleton_rawdev.c | 10 +++++----- drivers/raw/skeleton/skeleton_rawdev_test.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c index 6e99d35536..b307d8aab3 100644 --- a/drivers/raw/skeleton/skeleton_rawdev.c +++ b/drivers/raw/skeleton/skeleton_rawdev.c @@ -573,7 +573,7 @@ static const struct rte_rawdev_ops skeleton_rawdev_ops = { static int skeleton_rawdev_create(const char *name, struct rte_vdev_device *vdev, - int socket_id) + int numa_id) { int ret = 0, i; struct rte_rawdev *rawdev = NULL; @@ -587,7 +587,7 @@ skeleton_rawdev_create(const char *name, /* Allocate device structure */ rawdev = rte_rawdev_pmd_allocate(name, sizeof(struct skeleton_rawdev), - socket_id); + numa_id); if (rawdev == NULL) { SKELETON_PMD_ERR("Unable to allocate rawdevice"); ret = -EINVAL; @@ -729,12 +729,12 @@ skeleton_rawdev_probe(struct rte_vdev_device *vdev) return -EINVAL; } - SKELETON_PMD_INFO("Init %s on NUMA node %d", name, rte_socket_id()); + SKELETON_PMD_INFO("Init %s on NUMA node %d", name, rte_numa_id()); selftest = skeldev_parse_vdev_args(vdev); /* In case of invalid argument, selftest != 1; ignore other values */ - ret = skeleton_rawdev_create(name, vdev, rte_socket_id()); + ret = skeleton_rawdev_create(name, vdev, rte_numa_id()); if (ret >= 0) { /* In case command line argument for 'selftest' was passed; * if invalid arguments were passed, execution continues but @@ -760,7 +760,7 @@ skeleton_rawdev_remove(struct rte_vdev_device *vdev) if (name == NULL) return -1; - SKELETON_PMD_INFO("Closing %s on NUMA node %d", name, rte_socket_id()); + SKELETON_PMD_INFO("Closing %s on NUMA node %d", name, rte_numa_id()); ret = skeleton_rawdev_destroy(name); if (!ret) diff --git a/drivers/raw/skeleton/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c index 99765feb41..9bc808faaa 100644 --- a/drivers/raw/skeleton/skeleton_rawdev_test.c +++ b/drivers/raw/skeleton/skeleton_rawdev_test.c @@ -95,13 +95,13 @@ test_rawdev_get_dev_id(void) static int test_rawdev_socket_id(void) { - int socket_id; - socket_id = rte_rawdev_socket_id(test_dev_id); - RTE_TEST_ASSERT(socket_id != -EINVAL, - "Failed to get socket_id %d", socket_id); - socket_id = rte_rawdev_socket_id(RTE_RAWDEV_MAX_DEVS); - RTE_TEST_ASSERT(socket_id == -EINVAL, - "Expected -EINVAL %d", socket_id); + int numa_id; + numa_id = rte_rawdev_numa_id(test_dev_id); + RTE_TEST_ASSERT(numa_id != -EINVAL, + "Failed to get numa_id %d", numa_id); + numa_id = rte_rawdev_numa_id(RTE_RAWDEV_MAX_DEVS); + RTE_TEST_ASSERT(numa_id == -EINVAL, + "Expected -EINVAL %d", numa_id); return TEST_SUCCESS; } -- 2.55.0
