#include <rte_metrics.h>
#include <rte_common.h>
#include <rte_ethdev.h>
+#include <rte_metrics_telemetry.h>
#include "rte_telemetry_internal.h"
+#include "rte_telemetry_parser.h"
typedef int (*command_func)(struct telemetry_impl *, int, json_t *);
struct rte_telemetry_command {
- char *text;
+ const char *text;
command_func fn;
} command;
}
static int32_t
-rte_telemetry_stat_names_to_ids(struct telemetry_impl *telemetry,
- const char * const *stat_names, uint32_t *stat_ids,
- uint64_t num_stat_names)
+rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
+ int action, json_t *data)
{
- struct rte_metric_name *names;
- int ret, num_metrics;
- uint32_t i, k;
-
- if (stat_names == NULL) {
- TELEMETRY_LOG_WARN("Invalid stat_names argument");
- goto einval_fail;
- }
-
- if (num_stat_names <= 0) {
- TELEMETRY_LOG_WARN("Invalid num_stat_names argument");
- goto einval_fail;
- }
+ int ret;
+ struct telemetry_encode_param ep;
- num_metrics = rte_metrics_get_names(NULL, 0);
- if (num_metrics < 0) {
- TELEMETRY_LOG_ERR("Cannot get metrics count");
- goto eperm_fail;
- } else if (num_metrics == 0) {
- TELEMETRY_LOG_WARN("No metrics have been registered");
- goto eperm_fail;
+ memset(&ep, 0, sizeof(ep));
+ if (telemetry == NULL) {
+ TELEMETRY_LOG_ERR("Invalid telemetry argument");
+ return -1;
}
- names = malloc(sizeof(struct rte_metric_name) * num_metrics);
- if (names == NULL) {
- TELEMETRY_LOG_ERR("Cannot allocate memory for names");
-
- ret = rte_telemetry_send_error_response(telemetry, -ENOMEM);
+ if (action != ACTION_GET) {
+ TELEMETRY_LOG_WARN("Invalid action for this command");
+ ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
if (ret < 0)
TELEMETRY_LOG_ERR("Could not send error");
-
return -1;
}
- ret = rte_metrics_get_names(names, num_metrics);
- if (ret < 0 || ret > num_metrics) {
- TELEMETRY_LOG_ERR("Cannot get metrics names");
- free(names);
- goto eperm_fail;
+ if (json_is_object(data)) {
+ TELEMETRY_LOG_WARN("Invalid data provided for this command");
+ ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
+ if (ret < 0)
+ TELEMETRY_LOG_ERR("Could not send error");
+ return -1;
}
- k = 0;
- for (i = 0; i < (uint32_t)num_stat_names; i++) {
- uint32_t j;
- for (j = 0; j < (uint32_t)num_metrics; j++) {
- if (strcmp(stat_names[i], names[j].name) == 0) {
- stat_ids[k] = j;
- k++;
- break;
- }
- }
+ ret = rte_metrics_tel_get_port_stats_ids(&ep);
+ if (ret < 0) {
+ TELEMETRY_LOG_ERR("Could not get ports stat values");
+ ret = rte_telemetry_send_error_response(telemetry, ret);
+ if (ret < 0)
+ TELEMETRY_LOG_ERR("Could not send error");
+ return -1;
}
- if (k != num_stat_names) {
- TELEMETRY_LOG_WARN("Invalid stat names provided");
- free(names);
- goto einval_fail;
+ ret = rte_telemetry_send_ports_stats_values(&ep, telemetry);
+ if (ret < 0) {
+ TELEMETRY_LOG_ERR("Sending ports stats values failed");
+ return -1;
}
- free(names);
return 0;
-
-einval_fail:
- ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
- return -1;
-
-eperm_fail:
- ret = rte_telemetry_send_error_response(telemetry, -EPERM);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
- return -1;
}
-int32_t
-rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
+static int32_t
+rte_telemetry_command_global_stat_values(struct telemetry_impl *telemetry,
int action, json_t *data)
{
- int ret, num_metrics, i, p;
- struct rte_metric_name *names;
- uint64_t num_port_ids = 0;
+ int ret;
+ struct telemetry_encode_param ep;
+ memset(&ep, 0, sizeof(ep));
if (telemetry == NULL) {
TELEMETRY_LOG_ERR("Invalid telemetry argument");
return -1;
return -1;
}
- num_metrics = rte_metrics_get_names(NULL, 0);
- if (num_metrics < 0) {
- TELEMETRY_LOG_ERR("Cannot get metrics count");
-
- ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
-
- return -1;
- } else if (num_metrics == 0) {
- TELEMETRY_LOG_ERR("No metrics to display (none have been registered)");
-
- ret = rte_telemetry_send_error_response(telemetry, -EPERM);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
-
- return -1;
- }
-
- names = malloc(sizeof(struct rte_metric_name) * num_metrics);
- if (names == NULL) {
- TELEMETRY_LOG_ERR("Cannot allocate memory");
- ret = rte_telemetry_send_error_response(telemetry,
- -ENOMEM);
+ ret = rte_metrics_tel_get_global_stats(&ep);
+ if (ret < 0) {
+ TELEMETRY_LOG_ERR("Could not get global stat values");
+ ret = rte_telemetry_send_error_response(telemetry, ret);
if (ret < 0)
TELEMETRY_LOG_ERR("Could not send error");
return -1;
}
- const char *stat_names[num_metrics];
- uint32_t stat_ids[num_metrics];
-
- RTE_ETH_FOREACH_DEV(p) {
- num_port_ids++;
- }
-
- if (!num_port_ids) {
- TELEMETRY_LOG_WARN("No active ports");
-
- ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
-
- goto fail;
- }
-
- ret = rte_metrics_get_names(names, num_metrics);
- for (i = 0; i < num_metrics; i++)
- stat_names[i] = names[i].name;
-
- ret = rte_telemetry_stat_names_to_ids(telemetry, stat_names, stat_ids,
- num_metrics);
+ ret = rte_telemetry_send_global_stats_values(&ep, telemetry);
if (ret < 0) {
- TELEMETRY_LOG_ERR("Could not convert stat names to IDs");
- goto fail;
+ TELEMETRY_LOG_ERR("Sending global stats values failed");
+ return -1;
}
return 0;
-
-fail:
- free(names);
- return -1;
}
-int32_t
+static int32_t
rte_telemetry_command_ports_stats_values_by_name(struct telemetry_impl
*telemetry, int action, json_t *data)
{
int ret;
- json_t *port_ids_json = json_object_get(data, "ports");
- json_t *stat_names_json = json_object_get(data, "stats");
- uint64_t num_port_ids = json_array_size(port_ids_json);
- uint64_t num_stat_names = json_array_size(stat_names_json);
- const char *stat_names[num_stat_names];
- uint32_t port_ids[num_port_ids], stat_ids[num_stat_names];
- size_t index;
- json_t *value;
-
+ struct telemetry_encode_param ep;
if (telemetry == NULL) {
TELEMETRY_LOG_ERR("Invalid telemetry argument");
return -1;
return -1;
}
- if (!json_is_object(data)) {
- TELEMETRY_LOG_WARN("Invalid data provided for this command");
- ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
- return -1;
- }
-
- if (!json_is_array(port_ids_json) ||
- !json_is_array(stat_names_json)) {
- TELEMETRY_LOG_WARN("Invalid input data array(s)");
- ret = rte_telemetry_send_error_response(telemetry, -EINVAL);
+ ret = rte_metrics_tel_extract_data(&ep, data);
+ if (ret < 0) {
+ TELEMETRY_LOG_ERR("Extracting JSON data failed");
+ ret = rte_telemetry_send_error_response(telemetry, ret);
if (ret < 0)
TELEMETRY_LOG_ERR("Could not send error");
return -1;
}
- json_array_foreach(port_ids_json, index, value) {
- if (!json_is_integer(value)) {
- TELEMETRY_LOG_WARN("Port ID given is not valid");
- ret = rte_telemetry_send_error_response(telemetry,
- -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
- return -1;
- }
- port_ids[index] = json_integer_value(value);
- ret = rte_telemetry_is_port_active(port_ids[index]);
- if (ret < 1) {
- ret = rte_telemetry_send_error_response(telemetry,
- -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
- return -1;
- }
- }
-
- json_array_foreach(stat_names_json, index, value) {
- if (!json_is_string(value)) {
- TELEMETRY_LOG_WARN("Stat Name given is not a string");
-
- ret = rte_telemetry_send_error_response(telemetry,
- -EINVAL);
- if (ret < 0)
- TELEMETRY_LOG_ERR("Could not send error");
-
- return -1;
- }
- stat_names[index] = json_string_value(value);
- }
-
- ret = rte_telemetry_stat_names_to_ids(telemetry, stat_names, stat_ids,
- num_stat_names);
+ ret = rte_telemetry_send_ports_stats_values(&ep, telemetry);
if (ret < 0) {
- TELEMETRY_LOG_ERR("Could not convert stat names to IDs");
+ TELEMETRY_LOG_ERR("Sending ports stats values failed");
return -1;
}
+
return 0;
}
{
.text = "ports_all_stat_values",
.fn = &rte_telemetry_command_ports_all_stat_values
+ },
+ {
+ .text = "global_stat_values",
+ .fn = &rte_telemetry_command_global_stat_values
}
};
return -1;
}
-int32_t __rte_experimental
+int32_t
rte_telemetry_parse(struct telemetry_impl *telemetry, char *socket_rx_data)
{
int ret, action_int;
git.droids-corp.org / dpdk.git / blobdiff