git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/crypto: return correct value if feature not supported
[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
..
99a96b6
100644
(file)
--- a/
lib/librte_metrics/rte_metrics.c
+++ b/
lib/librte_metrics/rte_metrics.c
@@
-6,6
+6,7
@@
#include <sys/queue.h>
#include <rte_common.h>
#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_malloc.h>
#include <rte_metrics.h>
#include <rte_lcore.h>
@@
-95,6
+96,9
@@
rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
/* Some sanity checks */
if (cnt_names < 1 || names == NULL)
return -EINVAL;
/* 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)
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
if (memzone == NULL)
@@
-113,10
+117,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];
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;
}
memset(entry->value, 0, sizeof(entry->value));
entry->idx_next_stat = idx_name + stats->cnt_stats + 1;
}
@@
-161,6
+162,11
@@
rte_metrics_update_values(int port_id,
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);
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) {
idx_metric = key;
cnt_setsize = 1;
while (idx_metric < stats->cnt_stats) {
@@
-202,9
+208,8
@@
rte_metrics_get_names(struct rte_metric_name *names,
int return_value;
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
int return_value;
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
- /* If not allocated, fail silently */
if (memzone == NULL)
if (memzone == NULL)
- return
0
;
+ return
-EIO
;
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);
@@
-215,7
+220,7
@@
rte_metrics_get_names(struct rte_metric_name *names,
return return_value;
}
for (idx_name = 0; idx_name < stats->cnt_stats; idx_name++)
return return_value;
}
for (idx_name = 0; idx_name < stats->cnt_stats; idx_name++)
- str
n
cpy(names[idx_name].name,
+ str
l
cpy(names[idx_name].name,
stats->metadata[idx_name].name,
RTE_METRICS_MAX_NAME_LEN);
}
stats->metadata[idx_name].name,
RTE_METRICS_MAX_NAME_LEN);
}
@@
-240,9
+245,9
@@
rte_metrics_get_values(int port_id,
return -EINVAL;
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
return -EINVAL;
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
- /* If not allocated, fail silently */
if (memzone == NULL)
if (memzone == NULL)
- return 0;
+ return -EIO;
+
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);