From: Chengwen Feng <[email protected]> Rename socket_id parameters, internal variables and comments to the NUMA node terminology, and switch internal calls to rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <[email protected]> --- lib/metrics/rte_metrics.c | 4 ++-- lib/metrics/rte_metrics.h | 4 ++-- lib/metrics/rte_metrics_telemetry.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c index 4cd4623b7a..8896ea770f 100644 --- a/lib/metrics/rte_metrics.c +++ b/lib/metrics/rte_metrics.c @@ -58,7 +58,7 @@ struct rte_metrics_data_s { RTE_EXPORT_SYMBOL(rte_metrics_init) int -rte_metrics_init(int socket_id) +rte_metrics_init(int numa_id) { struct rte_metrics_data_s *stats; const struct rte_memzone *memzone; @@ -72,7 +72,7 @@ rte_metrics_init(int socket_id) if (memzone != NULL) return -EEXIST; memzone = rte_memzone_reserve(RTE_METRICS_MEMZONE_NAME, - sizeof(struct rte_metrics_data_s), socket_id, 0); + sizeof(struct rte_metrics_data_s), numa_id, 0); if (memzone == NULL) return -ENOMEM; stats = memzone->addr; diff --git a/lib/metrics/rte_metrics.h b/lib/metrics/rte_metrics.h index 5e17873dd7..e8e10447c3 100644 --- a/lib/metrics/rte_metrics.h +++ b/lib/metrics/rte_metrics.h @@ -76,7 +76,7 @@ struct rte_metric_value { * Initializes metric module. This function must be called from * a primary process before metrics are used. * - * @param socket_id + * @param numa_id * Socket to use for shared memory allocation. * @return * 0 on success @@ -85,7 +85,7 @@ struct rte_metric_value { * -ENOMEM - cannot allocate metrics memzone * -E_RTE_SECONDARY - function called from secondary process */ -int rte_metrics_init(int socket_id); +int rte_metrics_init(int numa_id); /** * Deinitialize metric module. This function must be called from diff --git a/lib/metrics/rte_metrics_telemetry.c b/lib/metrics/rte_metrics_telemetry.c index 2350ef5041..d7acd956db 100644 --- a/lib/metrics/rte_metrics_telemetry.c +++ b/lib/metrics/rte_metrics_telemetry.c @@ -98,7 +98,7 @@ rte_metrics_tel_reg_all_ethdev(int *metrics_register_done, int *reg_index_list) int ret, nb_drv_idx = 0; uint16_t d; - rte_metrics_init(rte_socket_id()); + rte_metrics_init(rte_numa_id()); RTE_ETH_FOREACH_DEV(d) { int i; /* Different device types have different numbers of stats, so @@ -443,7 +443,7 @@ static int rte_metrics_tel_initial_metrics_setup(void) { int ret; - rte_metrics_init(rte_socket_id()); + rte_metrics_init(rte_numa_id()); if (!tel_met_data.metrics_register_done) { ret = rte_metrics_tel_reg_all_ethdev( -- 2.55.0
