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/event/skeleton/skeleton_eventdev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c index 9eccf61cad..0893fac541 100644 --- a/drivers/event/skeleton/skeleton_eventdev.c +++ b/drivers/event/skeleton/skeleton_eventdev.c @@ -220,7 +220,7 @@ skeleton_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id, } /* Allocate event port memory */ - sp = rte_zmalloc_socket("eventdev port", + sp = rte_zmalloc_numa("eventdev port", sizeof(struct skeleton_port), RTE_CACHE_LINE_SIZE, dev->data->numa_id); if (sp == NULL) { @@ -351,7 +351,7 @@ skeleton_eventdev_init(struct rte_eventdev *eventdev) pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); - PMD_DRV_LOG(INFO, "dev_id=%d socket_id=%d (%x:%x)", + PMD_DRV_LOG(INFO, "dev_id=%d numa_id=%d (%x:%x)", eventdev->data->dev_id, eventdev->data->numa_id, skel->vendor_id, skel->device_id); @@ -401,12 +401,12 @@ RTE_PMD_REGISTER_PCI_TABLE(event_skeleton_pci, pci_id_skeleton_map); /* VDEV based event device */ static int -skeleton_eventdev_create(const char *name, int socket_id, struct rte_vdev_device *vdev) +skeleton_eventdev_create(const char *name, int numa_id, struct rte_vdev_device *vdev) { struct rte_eventdev *eventdev; eventdev = rte_event_pmd_vdev_init(name, - sizeof(struct skeleton_eventdev), socket_id, vdev); + sizeof(struct skeleton_eventdev), numa_id, vdev); if (eventdev == NULL) { PMD_DRV_ERR("Failed to create eventdev vdev %s", name); goto fail; @@ -428,8 +428,8 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev) const char *name; name = rte_vdev_device_name(vdev); - PMD_DRV_LOG(INFO, "Initializing %s on NUMA node %d", name, rte_socket_id()); - return skeleton_eventdev_create(name, rte_socket_id(), vdev); + PMD_DRV_LOG(INFO, "Initializing %s on NUMA node %d", name, rte_numa_id()); + return skeleton_eventdev_create(name, rte_numa_id(), vdev); } static int @@ -438,7 +438,7 @@ skeleton_eventdev_remove(struct rte_vdev_device *vdev) const char *name; name = rte_vdev_device_name(vdev); - PMD_DRV_LOG(INFO, "Closing %s on NUMA node %d", name, rte_socket_id()); + PMD_DRV_LOG(INFO, "Closing %s on NUMA node %d", name, rte_numa_id()); return rte_event_pmd_vdev_uninit(name); } -- 2.55.0
