Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / utils_cmd_putval.c

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index 826e1b0390fb53dbb7944a96bc5a29616edfded7..4cbc2f1d96d5a2237946fa69f9c4fabad709e78c 100644 (file)
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -36,57 +36,12 @@
 static int dispatch_values (const data_set_t *ds, value_list_t *vl,
                FILE *fh, char *buffer)
 {
-       char *dummy;
-       char *ptr;
-       char *saveptr;
-       int i;
-
-       char *time_str = buffer;
-       char *value_str = strchr (time_str, ':');
-       if (value_str == NULL)
-       {
-               print_to_socket (fh, "-1 No time found.\n");
-               return (-1);
-       }
-       *value_str = '\0'; value_str++;
-
-       vl->time = (time_t) atoi (time_str);
-
-       i = 0;
-       dummy = value_str;
-       saveptr = NULL;
-       while ((ptr = strtok_r (dummy, ":", &saveptr)) != NULL)
-       {
-               dummy = NULL;
+       int status;
 
-               if (i >= vl->values_len)
-               {
-                       i = vl->values_len + 1;
-                       break;
-               }
-
-               if ((strcmp (ptr, "U") == 0) && (ds->ds[i].type == DS_TYPE_GAUGE))
-                       vl->values[i].gauge = NAN;
-               else if (0 != parse_value (ptr, &vl->values[i], ds->ds[i]))
-               {
-                       print_to_socket (fh, "-1 Failed to parse value `%s'.\n", ptr);
-                       return (-1);
-               }
-
-               i++;
-       } /* while (strtok_r) */
-
-       if (i != vl->values_len)
+       status = parse_values (buffer, vl, ds);
+       if (status != 0)
        {
-               char identifier[128];
-               FORMAT_VL (identifier, sizeof (identifier), vl, ds);
-               ERROR ("cmd putval: dispatch_values: "
-                               "Number of values incorrect: "
-                               "Got %i, expected %i. Identifier is `%s'.",
-                               i, vl->values_len, identifier);
-               print_to_socket (fh, "-1 Number of values incorrect: "
-                               "Got %i, expected %i.\n",
-                               i, vl->values_len);
+               print_to_socket (fh, "-1 Parsing the values string failed.\n");
                return (-1);
        }
 
@@ -101,16 +56,16 @@ static int set_option (value_list_t *vl, const char *key, const char *value)
 
        if (strcasecmp ("interval", key) == 0)
        {
-               int tmp;
+               double tmp;
                char *endptr;
 
                endptr = NULL;
                errno = 0;
-               tmp = strtol (value, &endptr, 0);
+               tmp = strtod (value, &endptr);
 
                if ((errno == 0) && (endptr != NULL)
-                               && (endptr != value) && (tmp > 0))
-                       vl->interval = tmp;
+                               && (endptr != value) && (tmp > 0.0))
+                       vl->interval = DOUBLE_TO_CDTIME_T (tmp);
        }
        else
                return (1);
@@ -272,3 +227,31 @@ int handle_putval (FILE *fh, char *buffer)
        return (0);
 } /* int handle_putval */
 
+int create_putval (char *ret, size_t ret_len, /* {{{ */
+       const data_set_t *ds, const value_list_t *vl)
+{
+       char buffer_ident[6 * DATA_MAX_NAME_LEN];
+       char buffer_values[1024];
+       int status;
+
+       status = FORMAT_VL (buffer_ident, sizeof (buffer_ident), vl);
+       if (status != 0)
+               return (status);
+       escape_string (buffer_ident, sizeof (buffer_ident));
+
+       status = format_values (buffer_values, sizeof (buffer_values),
+                       ds, vl, /* store rates = */ 0);
+       if (status != 0)
+               return (status);
+       escape_string (buffer_values, sizeof (buffer_values));
+
+       ssnprintf (ret, ret_len,
+                       "PUTVAL %s interval=%.3f %s",
+                       buffer_ident,
+                       (vl->interval > 0)
+                       ? CDTIME_T_TO_DOUBLE (vl->interval)
+                       : CDTIME_T_TO_DOUBLE (plugin_get_interval ()),
+                       buffer_values);
+
+       return (0);
+} /* }}} int create_putval */