![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/rrdtool.c b/src/rrdtool.c
index 96eee579c2972430b52f62369b640d6ea98ab034..91be7b616754b730fef9dd57f5676ddb4b443dfc 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
#include "collectd.h"
#include "plugin.h"
#include "common.h"
+#include "utils_avltree.h"
#include "utils_debug.h"
/*
# undef __USE_ISOC99
#endif
+/*
+ * Private types
+ */
+struct rrd_cache_s
+{
+ int values_num;
+ char **values;
+ time_t first_value;
+};
+typedef struct rrd_cache_s rrd_cache_t;
+
+/*
+ * Private variables
+ */
static int rra_timespans[] =
{
3600,
};
static int rra_types_num = 3;
+static const char *config_keys[] =
+{
+ "CacheTimeout",
+ "CacheFlush",
+ "DataDir",
+ NULL
+};
+static int config_keys_num = 3;
+
+static char *datadir = NULL;
+
+static int cache_timeout = 0;
+static int cache_flush_timeout = 0;
+static time_t cache_flush_last;
+static avl_tree_t *cache = NULL;
+
/* * * * * * * * * *
* WARNING: Magic *
* * * * * * * * * */
int i;
memset (buffer, '\0', sizeof (buffer_len));
- buffer[0] = 'N';
- offset = 1;
+
+ status = snprintf (buffer, buffer_len, "%u", (unsigned int) vl->time);
+ if ((status < 1) || (status >= buffer_len))
+ return (-1);
+ offset = status;
for (i = 0; i < ds->ds_num; i++)
{
int offset = 0;
int status;
+ if (datadir != NULL)
+ {
+ status = snprintf (buffer + offset, buffer_len - offset,
+ "%s/", datadir);
+ if ((status < 1) || (status >= buffer_len - offset))
+ return (-1);
+ offset += status;
+ }
+
status = snprintf (buffer + offset, buffer_len - offset,
"%s/", vl->host);
if ((status < 1) || (status >= buffer_len - offset))
return (0);
} /* int value_list_to_filename */
+static rrd_cache_t *rrd_cache_insert (const char *filename,
+ const char *value)
+{
+ rrd_cache_t *rc = NULL;
+ int new_rc = 0;
+
+ if (cache != NULL)
+ avl_get (cache, filename, (void *) &rc);
+
+ if (rc == NULL)
+ {
+ rc = (rrd_cache_t *) malloc (sizeof (rrd_cache_t));
+ if (rc == NULL)
+ return (NULL);
+ rc->values_num = 0;
+ rc->values = NULL;
+ rc->first_value = 0;
+ new_rc = 1;
+ }
+
+ rc->values = (char **) realloc ((void *) rc->values,
+ (rc->values_num + 1) * sizeof (char *));
+ if (rc->values == NULL)
+ {
+ syslog (LOG_ERR, "rrdtool plugin: realloc failed: %s",
+ strerror (errno));
+ if (cache != NULL)
+ {
+ void *cache_key = NULL;
+ avl_remove (cache, filename, &cache_key, NULL);
+ sfree (cache_key);
+ }
+ free (rc);
+ return (NULL);
+ }
+
+ rc->values[rc->values_num] = strdup (value);
+ if (rc->values[rc->values_num] != NULL)
+ rc->values_num++;
+
+ if (rc->values_num == 1)
+ rc->first_value = time (NULL);
+
+ /* Insert if this is the first value */
+ if ((cache != NULL) && (new_rc == 1))
+ {
+ void *cache_key = strdup (filename);
+
+ if (cache_key == NULL)
+ {
+ syslog (LOG_ERR, "rrdtool plugin: strdup failed: %s",
+ strerror (errno));
+ sfree (rc->values[0]);
+ sfree (rc->values);
+ sfree (rc);
+ return (NULL);
+ }
+
+ avl_insert (cache, cache_key, rc);
+ }
+
+ DBG ("rrd_cache_insert (%s, %s) = %p", filename, value, (void *) rc);
+
+ return (rc);
+} /* rrd_cache_t *rrd_cache_insert */
+
+static int rrd_write_cache_entry (const char *filename, rrd_cache_t *rc)
+{
+ char **argv;
+ int argc;
+
+ char *fn;
+ int status;
+
+ int i;
+
+ argc = rc->values_num + 2;
+ argv = (char **) malloc ((argc + 1) * sizeof (char *));
+ if (argv == NULL)
+ return (-1);
+
+ fn = strdup (filename);
+ if (fn == NULL)
+ {
+ free (argv);
+ return (-1);
+ }
+
+ argv[0] = "update";
+ argv[1] = fn;
+ memcpy (argv + 2, rc->values, rc->values_num * sizeof (char *));
+ argv[argc] = NULL;
+
+ DBG ("rrd_update (argc = %i, argv = %p)", argc, (void *) argv);
+
+ optind = 0; /* bug in librrd? */
+ rrd_clear_error ();
+ status = rrd_update (argc, argv);
+
+ free (argv);
+ free (fn);
+
+ /* Free the value list of `rc' */
+ for (i = 0; i < rc->values_num; i++)
+ free (rc->values[i]);
+ free (rc->values);
+ rc->values = NULL;
+ rc->values_num = 0;
+
+ if (status != 0)
+ {
+ syslog (LOG_WARNING, "rrd_update failed: %s: %s",
+ filename, rrd_get_error ());
+ return (-1);
+ }
+
+ return (0);
+} /* int rrd_write_cache_entry */
+
+static void rrd_cache_flush (int timeout)
+{
+ rrd_cache_t *rc;
+ time_t now;
+
+ char **keys = NULL;
+ int keys_num = 0;
+
+ char *key;
+ avl_iterator_t *iter;
+ int i;
+
+ if (cache == NULL)
+ return;
+
+ DBG ("Flushing cache, timeout = %i", timeout);
+
+ now = time (NULL);
+
+ /* Build a list of entries to be flushed */
+ iter = avl_get_iterator (cache);
+ while (avl_iterator_next (iter, (void *) &key, (void *) &rc) == 0)
+ {
+ DBG ("key = %s; age = %i;", key, now - rc->first_value);
+ if ((now - rc->first_value) >= timeout)
+ {
+ keys = (char **) realloc ((void *) keys,
+ (keys_num + 1) * sizeof (char *));
+ if (keys == NULL)
+ {
+ DBG ("realloc failed: %s", strerror (errno));
+ syslog (LOG_ERR, "rrdtool plugin: "
+ "realloc failed: %s",
+ strerror (errno));
+ avl_iterator_destroy (iter);
+ return;
+ }
+ keys[keys_num] = key;
+ keys_num++;
+ }
+ } /* while (avl_iterator_next) */
+ avl_iterator_destroy (iter);
+
+ for (i = 0; i < keys_num; i++)
+ {
+ if (avl_remove (cache, keys[i], (void *) &key, (void *) &rc) != 0)
+ {
+ DBG ("avl_remove (%s) failed.", keys[i]);
+ continue;
+ }
+
+ rrd_write_cache_entry (keys[i], rc);
+ /* rc's value-list is free's by `rrd_write_cache_entry' */
+ sfree (rc);
+ sfree (key);
+ keys[i] = NULL;
+ } /* for (i = 0..keys_num) */
+
+ free (keys);
+ DBG ("Flushed %i value(s)", keys_num);
+
+ cache_flush_last = now;
+} /* void rrd_cache_flush */
+
static int rrd_write (const data_set_t *ds, const value_list_t *vl)
{
- struct stat statbuf;
- char filename[512];
- char values[512];
- char *argv[4] = { "update", filename, values, NULL };
+ struct stat statbuf;
+ char filename[512];
+ char values[512];
+ rrd_cache_t *rc;
+ time_t now;
if (value_list_to_filename (filename, sizeof (filename), ds, vl) != 0)
return (-1);
return (-1);
}
- optind = 0; /* bug in librrd? */
- rrd_clear_error ();
- if (rrd_update (3, argv) == -1)
+ rc = rrd_cache_insert (filename, values);
+ if (rc == NULL)
+ return (-1);
+
+ if (cache == NULL)
+ {
+ rrd_write_cache_entry (filename, rc);
+ /* rc's value-list is free's by `rrd_write_cache_entry' */
+ sfree (rc);
+ return (0);
+ }
+
+ now = time (NULL);
+
+ DBG ("age (%s) = %i", filename, now - rc->first_value);
+
+ /* `rc' is not free'd here, because we'll likely reuse it. If not, then
+ * the next flush will remove this entry. */
+ if ((now - rc->first_value) >= cache_timeout)
+ rrd_write_cache_entry (filename, rc);
+
+ if ((now - cache_flush_last) >= cache_flush_timeout)
+ rrd_cache_flush (cache_flush_timeout);
+
+ return (0);
+} /* int rrd_write */
+
+static int rrd_config (const char *key, const char *val)
+{
+ if (strcasecmp ("CacheTimeout", key) == 0)
+ {
+ int tmp = atoi (val);
+ if (tmp < 0)
+ {
+ fprintf (stderr, "rrdtool: `CacheTimeout' must "
+ "be greater than 0.\n");
+ return (1);
+ }
+ cache_timeout = tmp;
+ }
+ else if (strcasecmp ("CacheFlush", key) == 0)
+ {
+ int tmp = atoi (val);
+ if (tmp < 0)
+ {
+ fprintf (stderr, "rrdtool: `CacheFlush' must "
+ "be greater than 0.\n");
+ return (1);
+ }
+ cache_flush_timeout = tmp;
+ }
+ else if (strcasecmp ("DataDir", key) == 0)
+ {
+ if (datadir != NULL)
+ free (datadir);
+ datadir = strdup (val);
+ if (datadir != NULL)
+ {
+ int len = strlen (datadir);
+ while ((len > 0) && (datadir[len - 1] == '/'))
+ {
+ len--;
+ datadir[len] = '\0';
+ }
+ if (len <= 0)
+ {
+ free (datadir);
+ datadir = NULL;
+ }
+ }
+ }
+ else
{
- syslog (LOG_WARNING, "rrd_update failed: %s: %s",
- filename, rrd_get_error ());
return (-1);
}
return (0);
-} /* int rrd_update_file */
+} /* int rrd_config */
+
+static int rrd_shutdown (void)
+{
+ rrd_cache_flush (-1);
+ if (cache != NULL)
+ avl_destroy (cache);
+ cache = NULL;
+
+ return (0);
+} /* int rrd_shutdown */
+
+static int rrd_init (void)
+{
+ if (cache_timeout < 2)
+ {
+ cache_timeout = 0;
+ cache_flush_timeout = 0;
+ }
+ else
+ {
+ if (cache_flush_timeout < cache_timeout)
+ cache_flush_timeout = 10 * cache_timeout;
+
+ cache = avl_create ((int (*) (const void *, const void *)) strcmp);
+ cache_flush_last = time (NULL);
+ plugin_register_shutdown ("rrdtool", rrd_shutdown);
+ }
+ return (0);
+} /* int rrd_init */
void module_register (void)
{
+ plugin_register_config ("rrdtool", rrd_config,
+ config_keys, config_keys_num);
+ plugin_register_init ("rrdtool", rrd_init);
plugin_register_write ("rrdtool", rrd_write);
}