X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_putval.c;h=a0d20c5ebe03455dbbbb75d691c1af5bf98586ee;hb=f86731f4fca466e89453b02bf185730e7d547898;hp=ec2b5f876795b53f2faec5c5ddc6104d7c0679a3;hpb=a86c1a6b695f5f967fb102da12a9f93dcee26ed3;p=collectd.git

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index ec2b5f87..a0d20c5e 100644
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -24,30 +24,19 @@
 #include "plugin.h"
 
 #include "utils_parse_option.h"
+#include "utils_cmd_putval.h"
 
 #define print_to_socket(fh, ...) \
-	if (fprintf (fh, __VA_ARGS__) < 0) { \
-		char errbuf[1024]; \
-		WARNING ("handle_putval: failed to write to socket #%i: %s", \
-				fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-		return -1; \
-	}
-
-static int dispatch_values (const data_set_t *ds, value_list_t *vl,
-	       	FILE *fh, char *buffer)
-{
-	int status;
-
-	status = parse_values (buffer, vl, ds);
-	if (status != 0)
-	{
-		print_to_socket (fh, "-1 Parsing the values string failed.\n");
-		return (-1);
-	}
-
-	plugin_dispatch_values (vl);
-	return (0);
-} /* int dispatch_values */
+    do { \
+        if (fprintf (fh, __VA_ARGS__) < 0) { \
+            char errbuf[1024]; \
+            WARNING ("handle_putval: failed to write to socket #%i: %s", \
+                    fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+            sfree (vl.values); \
+            return -1; \
+        } \
+        fflush(fh); \
+    } while (0)
 
 static int set_option (value_list_t *vl, const char *key, const char *value)
 {
@@ -56,16 +45,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);
@@ -89,6 +78,7 @@ int handle_putval (FILE *fh, char *buffer)
 
 	const data_set_t *ds;
 	value_list_t vl = VALUE_LIST_INIT;
+	vl.values = NULL;
 
 	DEBUG ("utils_cmd_putval: handle_putval (fh = %p, buffer = %s);",
 			(void *) fh, buffer);
@@ -188,6 +178,7 @@ int handle_putval (FILE *fh, char *buffer)
 			/* parse_option failed, buffer has been modified.
 			 * => we need to abort */
 			print_to_socket (fh, "-1 Misformatted option.\n");
+			sfree (vl.values);
 			return (-1);
 		}
 		else if (status == 0)
@@ -204,16 +195,20 @@ int handle_putval (FILE *fh, char *buffer)
 		if (status != 0)
 		{
 			print_to_socket (fh, "-1 Misformatted value.\n");
+			sfree (vl.values);
 			return (-1);
 		}
 		assert (string != NULL);
 
-		status = dispatch_values (ds, &vl, fh, string);
+		status = parse_values (string, &vl, ds);
 		if (status != 0)
 		{
-			/* An error has already been printed. */
+			print_to_socket (fh, "-1 Parsing the values string failed.\n");
+			sfree (vl.values);
 			return (-1);
 		}
+
+		plugin_dispatch_values (&vl);
 		values_submitted++;
 	} /* while (*buffer != 0) */
 	/* Done parsing the options. */
@@ -222,8 +217,35 @@ int handle_putval (FILE *fh, char *buffer)
 			values_submitted,
 			(values_submitted == 1) ? "value has" : "values have");
 
-	sfree (vl.values); 
-
+	sfree (vl.values);
 	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 */