csv, rrdtool plugin: Initialize a buffer correctly.

[collectd.git] / src / rrdtool.c

diff --git a/src/rrdtool.c b/src/rrdtool.c
index b221341..d20a814 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/rrdtool.c
- * Copyright (C) 2006  Florian octo Forster
+ * Copyright (C) 2006,2007  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -36,6 +36,7 @@ struct rrd_cache_s
        int    values_num;
        char **values;
        time_t first_value;
+       time_t last_value;
 };
 typedef struct rrd_cache_s rrd_cache_t;
 
@@ -52,6 +53,9 @@ static int rra_timespans[] =
 };
 static int rra_timespans_num = STATIC_ARRAY_SIZE (rra_timespans);
 
+static int *rra_timespans_custom = NULL;
+static int rra_timespans_custom_num = 0;
+
 static char *rra_types[] =
 {
        "AVERAGE",
@@ -68,6 +72,7 @@ static const char *config_keys[] =
        "StepSize",
        "HeartBeat",
        "RRARows",
+       "RRATimespan",
        "XFF"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
@@ -92,7 +97,10 @@ static int rra_get (char ***ret)
        static char **rra_def = NULL;
        static int rra_num = 0;
 
-       int rra_max = rra_timespans_num * rra_types_num;
+       int *rts;
+       int  rts_num;
+
+       int rra_max;
 
        int span;
 
@@ -108,6 +116,20 @@ static int rra_get (char ***ret)
                return (rra_num);
        }
 
+       /* Use the configured timespans or fall back to the built-in defaults */
+       if (rra_timespans_custom_num != 0)
+       {
+               rts = rra_timespans_custom;
+               rts_num = rra_timespans_custom_num;
+       }
+       else
+       {
+               rts = rra_timespans;
+               rts_num = rra_timespans_num;
+       }
+
+       rra_max = rts_num * rra_types_num;
+
        if ((rra_def = (char **) malloc ((rra_max + 1) * sizeof (char *))) == NULL)
                return (-1);
        memset (rra_def, '\0', (rra_max + 1) * sizeof (char *));
@@ -119,9 +141,9 @@ static int rra_get (char ***ret)
        }
 
        cdp_len = 0;
-       for (i = 0; i < rra_timespans_num; i++)
+       for (i = 0; i < rts_num; i++)
        {
-               span = rra_timespans[i];
+               span = rts[i];
 
                if ((span / stepsize) < rrarows)
                        continue;
@@ -339,7 +361,7 @@ static int value_list_to_string (char *buffer, int buffer_len,
        int status;
        int i;
 
-       memset (buffer, '\0', sizeof (buffer_len));
+       memset (buffer, '\0', buffer_len);
 
        status = snprintf (buffer, buffer_len, "%u", (unsigned int) vl->time);
        if ((status < 1) || (status >= buffer_len))
@@ -413,7 +435,7 @@ static int value_list_to_filename (char *buffer, int buffer_len,
 } /* int value_list_to_filename */
 
 static rrd_cache_t *rrd_cache_insert (const char *filename,
-               const char *value)
+               const char *value, time_t value_time)
 {
        rrd_cache_t *rc = NULL;
        int new_rc = 0;
@@ -429,9 +451,18 @@ static rrd_cache_t *rrd_cache_insert (const char *filename,
                rc->values_num = 0;
                rc->values = NULL;
                rc->first_value = 0;
+               rc->last_value = 0;
                new_rc = 1;
        }
 
+       if (rc->last_value >= value_time)
+       {
+               WARNING ("rrdtool plugin: (rc->last_value = %u) >= (value_time = %u)",
+                               (unsigned int) rc->last_value,
+                               (unsigned int) value_time);
+               return (NULL);
+       }
+
        rc->values = (char **) realloc ((void *) rc->values,
                        (rc->values_num + 1) * sizeof (char *));
        if (rc->values == NULL)
@@ -454,7 +485,8 @@ static rrd_cache_t *rrd_cache_insert (const char *filename,
                rc->values_num++;
 
        if (rc->values_num == 1)
-               rc->first_value = time (NULL);
+               rc->first_value = value_time;
+       rc->last_value = value_time;
 
        /* Insert if this is the first value */
        if ((cache != NULL) && (new_rc == 1))
@@ -475,7 +507,8 @@ static rrd_cache_t *rrd_cache_insert (const char *filename,
                avl_insert (cache, cache_key, rc);
        }
 
-       DEBUG ("rrd_cache_insert (%s, %s) = %p", filename, value, (void *) rc);
+       DEBUG ("rrd_cache_insert (%s, %s, %u) = %p", filename, value,
+                       (unsigned int) value_time, (void *) rc);
 
        return (rc);
 } /* rrd_cache_t *rrd_cache_insert */
@@ -637,7 +670,7 @@ static int rrd_write (const data_set_t *ds, const value_list_t *vl)
        }
 
        pthread_mutex_lock (&cache_lock);
-       rc = rrd_cache_insert (filename, values);
+       rc = rrd_cache_insert (filename, values, vl->time);
        if (rc == NULL)
        {
                pthread_mutex_unlock (&cache_lock);
@@ -746,6 +779,38 @@ static int rrd_config (const char *key, const char *value)
                }
                rrarows = tmp;
        }
+       else if (strcasecmp ("RRATimespan", key) == 0)
+       {
+               char *saveptr = NULL;
+               char *dummy;
+               char *ptr;
+               char *value_copy;
+               int *tmp_alloc;
+
+               value_copy = strdup (value);
+               if (value_copy == NULL)
+                       return (1);
+
+               dummy = value_copy;
+               while ((ptr = strtok_r (dummy, ", \t", &saveptr)) != NULL)
+               {
+                       dummy = NULL;
+                       
+                       tmp_alloc = realloc (rra_timespans_custom,
+                                       sizeof (int) * (rra_timespans_custom_num + 1));
+                       if (tmp_alloc == NULL)
+                       {
+                               fprintf (stderr, "rrdtool: realloc failed.\n");
+                               free (value_copy);
+                               return (1);
+                       }
+                       rra_timespans_custom = tmp_alloc;
+                       rra_timespans_custom[rra_timespans_custom_num] = atoi (ptr);
+                       if (rra_timespans_custom[rra_timespans_custom_num] != 0)
+                               rra_timespans_custom_num++;
+               } /* while (strtok_r) */
+               free (value_copy);
+       }
        else if (strcasecmp ("XFF", key) == 0)
        {
                double tmp = atof (value);
@@ -817,7 +882,7 @@ static int rrd_init (void)
        return (0);
 } /* int rrd_init */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
        plugin_register_config ("rrdtool", rrd_config,
                        config_keys, config_keys_num);