telemetry: fix JSON output buffer length

[dpdk.git] / lib / telemetry / telemetry.c

diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 386d008..48f4c7b 100644 (file)
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -7,6 +7,7 @@
 #include <pthread.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/stat.h>
 #include <dlfcn.h>
 #endif /* !RTE_EXEC_ENV_WINDOWS */
 
@@ -23,7 +24,6 @@
 #include "telemetry_internal.h"
 
 #define MAX_CMD_LEN 56
-#define MAX_HELP_LEN 64
 #define MAX_OUTPUT_LEN (1024 * 16)
 #define MAX_CONNECTIONS 10
 
@@ -35,7 +35,7 @@ client_handler(void *socket);
 struct cmd_callback {
        char cmd[MAX_CMD_LEN];
        telemetry_cb fn;
-       char help[MAX_HELP_LEN];
+       char help[RTE_TEL_MAX_STRING_LEN];
 };
 
 #ifndef RTE_EXEC_ENV_WINDOWS
@@ -59,7 +59,7 @@ static uint32_t logtype;
         rte_log_ptr(RTE_LOG_ ## l, logtype, "TELEMETRY: " __VA_ARGS__)
 
 /* list of command callbacks, with one command registered by default */
-static struct cmd_callback callbacks[TELEMETRY_MAX_CALLBACKS];
+static struct cmd_callback *callbacks;
 static int num_callbacks; /* How many commands are registered */
 /* Used when accessing or modifying list of command callbacks */
 static rte_spinlock_t callback_sl = RTE_SPINLOCK_INITIALIZER;
@@ -70,15 +70,21 @@ static uint16_t v2_clients;
 int
 rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help)
 {
+       struct cmd_callback *new_callbacks;
        int i = 0;
 
        if (strlen(cmd) >= MAX_CMD_LEN || fn == NULL || cmd[0] != '/'
-                       || strlen(help) >= MAX_HELP_LEN)
+                       || strlen(help) >= RTE_TEL_MAX_STRING_LEN)
                return -EINVAL;
-       if (num_callbacks >= TELEMETRY_MAX_CALLBACKS)
-               return -ENOENT;
 
        rte_spinlock_lock(&callback_sl);
+       new_callbacks = realloc(callbacks, sizeof(callbacks[0]) * (num_callbacks + 1));
+       if (new_callbacks == NULL) {
+               rte_spinlock_unlock(&callback_sl);
+               return -ENOMEM;
+       }
+       callbacks = new_callbacks;
+
        while (i < num_callbacks && strcmp(cmd, callbacks[i].cmd) > 0)
                i++;
        if (i != num_callbacks)
@@ -88,7 +94,7 @@ rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help)
 
        strlcpy(callbacks[i].cmd, cmd, MAX_CMD_LEN);
        callbacks[i].fn = fn;
-       strlcpy(callbacks[i].help, help, MAX_HELP_LEN);
+       strlcpy(callbacks[i].help, help, RTE_TEL_MAX_STRING_LEN);
        num_callbacks++;
        rte_spinlock_unlock(&callback_sl);
 
@@ -104,8 +110,10 @@ list_commands(const char *cmd __rte_unused, const char *params __rte_unused,
        int i;
 
        rte_tel_data_start_array(d, RTE_TEL_STRING_VAL);
+       rte_spinlock_lock(&callback_sl);
        for (i = 0; i < num_callbacks; i++)
                rte_tel_data_add_array_string(d, callbacks[i].cmd);
+       rte_spinlock_unlock(&callback_sl);
        return 0;
 }
 
@@ -148,8 +156,8 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len)
        size_t used = 0;
        unsigned int i;
 
-       if (d->type != RTE_TEL_ARRAY_U64 && d->type != RTE_TEL_ARRAY_INT
-                       && d->type != RTE_TEL_ARRAY_STRING)
+       if (d->type != RTE_TEL_DICT && d->type != RTE_TEL_ARRAY_U64 &&
+               d->type != RTE_TEL_ARRAY_INT && d->type != RTE_TEL_ARRAY_STRING)
                return snprintf(out_buf, buf_len, "null");
 
        used = rte_tel_json_empty_array(out_buf, buf_len, 0);
@@ -168,6 +176,43 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len)
                        used = rte_tel_json_add_array_string(out_buf,
                                buf_len, used,
                                d->data.array[i].sval);
+       if (d->type == RTE_TEL_DICT)
+               for (i = 0; i < d->data_len; i++) {
+                       const struct tel_dict_entry *v = &d->data.dict[i];
+                       switch (v->type) {
+                       case RTE_TEL_STRING_VAL:
+                               used = rte_tel_json_add_obj_str(out_buf,
+                                               buf_len, used,
+                                               v->name, v->value.sval);
+                               break;
+                       case RTE_TEL_INT_VAL:
+                               used = rte_tel_json_add_obj_int(out_buf,
+                                               buf_len, used,
+                                               v->name, v->value.ival);
+                               break;
+                       case RTE_TEL_U64_VAL:
+                               used = rte_tel_json_add_obj_u64(out_buf,
+                                               buf_len, used,
+                                               v->name, v->value.u64val);
+                               break;
+                       case RTE_TEL_CONTAINER:
+                       {
+                               char temp[buf_len];
+                               const struct container *cont =
+                                               &v->value.container;
+                               if (container_to_json(cont->data,
+                                               temp, buf_len) != 0)
+                                       used = rte_tel_json_add_obj_json(
+                                                       out_buf,
+                                                       buf_len, used,
+                                                       v->name, temp);
+                               if (!cont->keep)
+                                       rte_tel_data_free(cont->data);
+                               break;
+                       }
+                       }
+               }
+
        return used;
 }
 
@@ -414,7 +459,11 @@ create_socket(char *path)
        strlcpy(sun.sun_path, path, sizeof(sun.sun_path));
        unlink(sun.sun_path);
        if (bind(sock, (void *) &sun, sizeof(sun)) < 0) {
+               struct stat st;
+
                TMTY_LOG(ERR, "Error binding socket: %s\n", strerror(errno));
+               if (stat(socket_dir, &st) < 0 || !S_ISDIR(st.st_mode))
+                       TMTY_LOG(ERR, "Cannot access DPDK runtime directory: %s\n", socket_dir);
                sun.sun_path[0] = 0;
                goto error;
        }
@@ -477,6 +526,7 @@ telemetry_legacy_init(void)
        pthread_setaffinity_np(t_old, sizeof(*thread_cpuset), thread_cpuset);
        set_thread_name(t_old, "telemetry-v1");
        TMTY_LOG(DEBUG, "Legacy telemetry socket initialized ok\n");
+       pthread_detach(t_old);
        return 0;
 }
 
@@ -515,6 +565,7 @@ telemetry_v2_init(void)
        }
        pthread_setaffinity_np(t_new, sizeof(*thread_cpuset), thread_cpuset);
        set_thread_name(t_new, "telemetry-v2");
+       pthread_detach(t_new);
        atexit(unlink_sockets);
 
        return 0;