doc: add Meson coding style to contributors guide

[dpdk.git] / lib / librte_metrics / rte_metrics.c

diff --git a/lib/librte_metrics/rte_metrics.c b/lib/librte_metrics/rte_metrics.c
index 556ae1b..e2a0fbe 100644 (file)
--- a/lib/librte_metrics/rte_metrics.c
+++ b/lib/librte_metrics/rte_metrics.c
@@ -6,13 +6,15 @@
 #include <sys/queue.h>
 
 #include <rte_common.h>
+#include <rte_string_fns.h>
 #include <rte_malloc.h>
 #include <rte_metrics.h>
 #include <rte_lcore.h>
 #include <rte_memzone.h>
 #include <rte_spinlock.h>
 
-#define RTE_METRICS_MAX_METRICS 256
+int metrics_initialized;
+
 #define RTE_METRICS_MEMZONE_NAME "RTE_METRICS"
 
 /**
@@ -60,6 +62,8 @@ rte_metrics_init(int socket_id)
        struct rte_metrics_data_s *stats;
        const struct rte_memzone *memzone;
 
+       if (metrics_initialized)
+               return;
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return;
 
@@ -73,6 +77,30 @@ rte_metrics_init(int socket_id)
        stats = memzone->addr;
        memset(stats, 0, sizeof(struct rte_metrics_data_s));
        rte_spinlock_init(&stats->lock);
+       metrics_initialized = 1;
+}
+
+int
+rte_metrics_deinit(void)
+{
+       struct rte_metrics_data_s *stats;
+       const struct rte_memzone *memzone;
+       int ret;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return -EINVAL;
+
+       memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
+       if (memzone == NULL)
+               return -EIO;
+
+       stats = memzone->addr;
+       memset(stats, 0, sizeof(struct rte_metrics_data_s));
+
+       ret = rte_memzone_free(memzone);
+       if (ret == 0)
+               metrics_initialized = 0;
+       return ret;
 }
 
 int
@@ -95,6 +123,9 @@ rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
        /* Some sanity checks */
        if (cnt_names < 1 || names == NULL)
                return -EINVAL;
+       for (idx_name = 0; idx_name < cnt_names; idx_name++)
+               if (names[idx_name] == NULL)
+                       return -EINVAL;
 
        memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
        if (memzone == NULL)
@@ -113,10 +144,7 @@ rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
 
        for (idx_name = 0; idx_name < cnt_names; idx_name++) {
                entry = &stats->metadata[idx_name + stats->cnt_stats];
-               strncpy(entry->name, names[idx_name],
-                       RTE_METRICS_MAX_NAME_LEN);
-               /* Enforce NULL-termination */
-               entry->name[RTE_METRICS_MAX_NAME_LEN - 1] = '\0';
+               strlcpy(entry->name, names[idx_name], RTE_METRICS_MAX_NAME_LEN);
                memset(entry->value, 0, sizeof(entry->value));
                entry->idx_next_stat = idx_name + stats->cnt_stats + 1;
        }
@@ -161,6 +189,11 @@ rte_metrics_update_values(int port_id,
        stats = memzone->addr;
 
        rte_spinlock_lock(&stats->lock);
+
+       if (key >= stats->cnt_stats) {
+               rte_spinlock_unlock(&stats->lock);
+               return -EINVAL;
+       }
        idx_metric = key;
        cnt_setsize = 1;
        while (idx_metric < stats->cnt_stats) {
@@ -202,9 +235,8 @@ rte_metrics_get_names(struct rte_metric_name *names,
        int return_value;
 
        memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
-       /* If not allocated, fail silently */
        if (memzone == NULL)
-               return 0;
+               return -EIO;
 
        stats = memzone->addr;
        rte_spinlock_lock(&stats->lock);
@@ -215,7 +247,7 @@ rte_metrics_get_names(struct rte_metric_name *names,
                        return return_value;
                }
                for (idx_name = 0; idx_name < stats->cnt_stats; idx_name++)
-                       strncpy(names[idx_name].name,
+                       strlcpy(names[idx_name].name,
                                stats->metadata[idx_name].name,
                                RTE_METRICS_MAX_NAME_LEN);
        }
@@ -240,9 +272,9 @@ rte_metrics_get_values(int port_id,
                return -EINVAL;
 
        memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
-       /* If not allocated, fail silently */
        if (memzone == NULL)
-               return 0;
+               return -EIO;
+
        stats = memzone->addr;
        rte_spinlock_lock(&stats->lock);