statsd plugin: Don't use strtok_r() to split multi-metric packets.

[collectd.git] / src / statsd.c

diff --git a/src/statsd.c b/src/statsd.c
index 2ba42bfdd121f029eeb18c1af10e073d3006d11f..364b97d7c5838cd4625d55065054f25fe3d2c73f 100644 (file)
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -80,10 +80,9 @@ static double *conf_timer_percentile = NULL;
 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 const *prefix;
   char key[DATA_MAX_NAME_LEN + 2];
   char *key_copy;
   statsd_metric_t *metric;
@@ -91,14 +90,15 @@ static statsd_metric_t *statsd_metric_lookup_unsafe (char const *name,
 
   switch (type)
   {
-    case STATSD_COUNTER: prefix = "c"; break;
-    case STATSD_TIMER:   prefix = "t"; break;
-    case STATSD_GAUGE:   prefix = "g"; break;
-    case STATSD_SET:     prefix = "s"; break;
+    case STATSD_COUNTER: key[0] = 'c'; break;
+    case STATSD_TIMER:   key[0] = 't'; break;
+    case STATSD_GAUGE:   key[0] = 'g'; break;
+    case STATSD_SET:     key[0] = 's'; break;
     default: return (NULL);
   }
 
-  ssnprintf (key, sizeof (key), "%s:%s", prefix, name);
+  key[1] = ':';
+  sstrncpy (&key[2], name, sizeof (key) - 2);
 
   status = c_avl_get (metrics_tree, key, (void *) &metric);
   if (status == 0)
@@ -180,6 +180,17 @@ static int statsd_metric_add (char const *name, int64_t delta, /* {{{ */
   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)
@@ -203,7 +214,7 @@ static int statsd_handle_counter (char const *name, /* {{{ */
   }
 
   value.derive = 1;
-  status = parse_value (value_str, &value, DS_TYPE_DERIVE);
+  status = statsd_parse_value (value_str, &value);
   if (status != 0)
     return (status);
 
@@ -222,7 +233,7 @@ static int statsd_handle_gauge (char const *name, /* {{{ */
   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);
 
@@ -241,7 +252,7 @@ static int statsd_handle_timer (char const *name, /* {{{ */
   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);
 
@@ -372,22 +383,32 @@ static int statsd_parse_line (char *buffer) /* {{{ */
 
 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 */