X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=4655b96ee77c79a74dca16f9f412bd2df55d3cd7;hb=8341769294c500d8b0aa8e689aa0cfc72a63a09b;hp=2bcfb6d96743076176dc0c96dca3cc60ef9f4c8b;hpb=bdcac4078f8052b8e4f425a1e5aea3957551e0d3;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 2bcfb6d9..4655b96e 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -1,6 +1,8 @@
 /**
  * collectd - src/rrdtool.c
  * Copyright (C) 2006-2008  Florian octo Forster
+ * Copyright (C) 2008-2008  Sebastian Harl
+ * Copyright (C) 2009       Mariusz Gronczewski
  *
  * 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
@@ -17,6 +19,8 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Sebastian Harl <sh at tokkee.org>
+ *   Mariusz Gronczewski <xani666 at gmail.com>
  **/
 
 #include "collectd.h"
@@ -106,7 +110,6 @@ static rrdcreate_config_t rrdcreate_config =
 static int         cache_timeout = 0;
 static int         cache_flush_timeout = 0;
 static int         random_timeout = 1;
-static int         random_timeout_mod = 1;
 static time_t      cache_flush_last;
 static c_avl_tree_t *cache = NULL;
 static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -429,11 +432,6 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data)
 		sfree (queue_entry);
 	} /* while (42) */
 
-	pthread_mutex_lock (&cache_lock);
-	c_avl_destroy (cache);
-	cache = NULL;
-	pthread_mutex_unlock (&cache_lock);
-
 	pthread_exit ((void *) 0);
 	return ((void *) 0);
 } /* void *rrd_queue_thread */
@@ -673,6 +671,7 @@ static int rrd_cache_insert (const char *filename,
 		rc->values = NULL;
 		rc->first_value = 0;
 		rc->last_value = 0;
+		rc->random_variation = 0;
 		rc->flags = FLAG_NONE;
 		new_rc = 1;
 	}
@@ -680,7 +679,7 @@ static int rrd_cache_insert (const char *filename,
 	if (rc->last_value >= value_time)
 	{
 		pthread_mutex_unlock (&cache_lock);
-		WARNING ("rrdtool plugin: (rc->last_value = %u) >= (value_time = %u)",
+		DEBUG ("rrdtool plugin: (rc->last_value = %u) >= (value_time = %u)",
 				(unsigned int) rc->last_value,
 				(unsigned int) value_time);
 		return (-1);
@@ -743,17 +742,29 @@ static int rrd_cache_insert (const char *filename,
 			filename, rc->values_num,
 			(unsigned long)(rc->last_value - rc->first_value));
 
-	if ((rc->last_value - rc->first_value + rc->random_variation) >= cache_timeout)
+	if ((rc->last_value + rc->random_variation - rc->first_value) >= cache_timeout)
 	{
 		/* XXX: If you need to lock both, cache_lock and queue_lock, at
 		 * the same time, ALWAYS lock `cache_lock' first! */
 		if (rc->flags == FLAG_NONE)
 		{
 			int status;
-			rc->random_variation = (random_timeout - (rand() % random_timeout_mod));
+
 			status = rrd_queue_enqueue (filename, &queue_head, &queue_tail);
 			if (status == 0)
 				rc->flags = FLAG_QUEUED;
+
+			/* Update the jitter value. Negative values are
+			 * slightly preferred. */
+			if (random_timeout > 0)
+			{
+				rc->random_variation = (rand () % (2 * random_timeout))
+					- random_timeout;
+			}
+			else
+			{
+				rc->random_variation = 0;
+			}
 		}
 		else
 		{
@@ -770,6 +781,59 @@ static int rrd_cache_insert (const char *filename,
 	return (0);
 } /* int rrd_cache_insert */
 
+static int rrd_cache_destroy (void) /* {{{ */
+{
+  void *key = NULL;
+  void *value = NULL;
+
+  int non_empty = 0;
+
+  pthread_mutex_lock (&cache_lock);
+
+  if (cache == NULL)
+  {
+    pthread_mutex_unlock (&cache_lock);
+    return (0);
+  }
+
+  while (c_avl_pick (cache, &key, &value) == 0)
+  {
+    rrd_cache_t *rc;
+    int i;
+
+    sfree (key);
+    key = NULL;
+
+    rc = value;
+    value = NULL;
+
+    if (rc->values_num > 0)
+      non_empty++;
+
+    for (i = 0; i < rc->values_num; i++)
+      sfree (rc->values[i]);
+    sfree (rc->values);
+    sfree (rc);
+  }
+
+  c_avl_destroy (cache);
+  cache = NULL;
+
+  if (non_empty > 0)
+  {
+    INFO ("rrdtool plugin: %i cache %s had values when destroying the cache.",
+        non_empty, (non_empty == 1) ? "entry" : "entries");
+  }
+  else
+  {
+    DEBUG ("rrdtool plugin: No values have been lost "
+        "when destroying the cache.");
+  }
+
+  pthread_mutex_unlock (&cache_lock);
+  return (0);
+} /* }}} int rrd_cache_destroy */
+
 static int rrd_compare_numeric (const void *a_ptr, const void *b_ptr)
 {
 	int a = *((int *) a_ptr);
@@ -791,6 +855,9 @@ static int rrd_write (const data_set_t *ds, const value_list_t *vl,
 	char         values[512];
 	int          status;
 
+	if (do_shutdown)
+		return (0);
+
 	if (0 != strcmp (ds->type, vl->type)) {
 		ERROR ("rrdtool plugin: DS type does not match value list type");
 		return -1;
@@ -994,16 +1061,20 @@ static int rrd_config (const char *key, const char *value)
 	}
 	else if (strcasecmp ("RandomTimeout", key) == 0)
         {
-		random_timeout = atoi (value);
-		if( random_timeout < 0 )
+		int tmp;
+
+		tmp = atoi (value);
+		if (tmp < 0)
+		{
+			fprintf (stderr, "rrdtool: `RandomTimeout' must "
+					"be greater than or equal to zero.\n");
+			ERROR ("rrdtool: `RandomTimeout' must "
+					"be greater then or equal to zero.");
+		}
+		else
 		{
-		fprintf (stderr, "rrdtool: `RandomTimeout' must "
-			 "be greater than or equal to zero.\n");
-		ERROR ("rrdtool: `RandomTimeout' must "
-		       "be greater then or equal to zero.\n");
+			random_timeout = tmp;
 		}
-		else if (random_timeout==0) {random_timeout=1;}
-		else {random_timeout_mod = random_timeout * 2;}
 	}
 	else
 	{
@@ -1043,7 +1114,7 @@ static int rrd_shutdown (void)
 		DEBUG ("rrdtool plugin: queue_thread exited.");
 	}
 
-	/* TODO: Maybe it'd be a good idea to free the cache here.. */
+	rrd_cache_destroy ();
 
 	return (0);
 } /* int rrd_shutdown */