diff --git a/src/statsd.c b/src/statsd.c
index b8fee175574334521120642c78714e80d2db6e84..364b97d7c5838cd4625d55065054f25fe3d2c73f 100644 (file)
--- a/src/statsd.c
+++ b/src/statsd.c
static size_t conf_timer_percentile_num = 0;
/* Must hold metrics_lock when calling this function. */
-static statsd_metric_t *statsd_metric_lookup_unsafe (char const *name,
+static statsd_metric_t *statsd_metric_lookup_unsafe (char const *name, /* {{{ */
metric_type_t type)
{
char key[DATA_MAX_NAME_LEN + 2];
return (0);
} /* }}} int statsd_metric_add */
+static int statsd_parse_value (char const *str, value_t *ret_value) /* {{{ */
+{
+ char *endptr = NULL;
+
+ ret_value->derive = (derive_t) strtoll (str, &endptr, /* base = */ 0);
+ if ((str == endptr) || ((endptr != NULL) && (*endptr != 0)))
+ return (-1);
+
+ return (0);
+} /* }}} int statsd_parse_value */
+
static int statsd_handle_counter (char const *name, /* {{{ */
char const *value_str,
char const *extra)
}
value.derive = 1;
- status = parse_value (value_str, &value, DS_TYPE_DERIVE);
+ status = statsd_parse_value (value_str, &value);
if (status != 0)
return (status);
int status;
value.derive = 0;
- status = parse_value (value_str, &value, DS_TYPE_DERIVE);
+ status = statsd_parse_value (value_str, &value);
if (status != 0)
return (status);
int status;
value_ms.derive = 0;
- status = parse_value (value_str, &value_ms, DS_TYPE_DERIVE);
+ status = statsd_parse_value (value_str, &value_ms);
if (status != 0)
return (status);
static void statsd_parse_buffer (char *buffer) /* {{{ */
{
- char *dummy;
- char *saveptr = NULL;
- char *ptr;
-
- for (dummy = buffer;
- (ptr = strtok_r (dummy, "\r\n", &saveptr)) != NULL;
- dummy = NULL)
+ while (buffer != NULL)
{
- char *line_orig = sstrdup (ptr);
+ char orig[64];
+ char *next;
int status;
- status = statsd_parse_line (ptr);
+ next = strchr (buffer, '\n');
+ if (next != NULL)
+ {
+ *next = 0;
+ next++;
+ }
+
+ if (*buffer == 0)
+ {
+ buffer = next;
+ continue;
+ }
+
+ sstrncpy (orig, buffer, sizeof (orig));
+
+ status = statsd_parse_line (buffer);
if (status != 0)
- ERROR ("statsd plugin: Unable to parse line: \"%s\"", line_orig);
+ ERROR ("statsd plugin: Unable to parse line: \"%s\"", orig);
- sfree (line_orig);
+ buffer = next;
}
} /* }}} void statsd_parse_buffer */