X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=4655b96ee77c79a74dca16f9f412bd2df55d3cd7;hb=79f132efd2504a52d30d5d885581e3ee4ee26790;hp=811aea0aa2b13e65155816f600afd2908c6effe7;hpb=c35203c82560eba66bb901aa22c5170fb8c389fb;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 811aea0a..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"
@@ -428,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 */
@@ -672,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;
 	}
@@ -679,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);
@@ -781,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);
@@ -802,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;
@@ -1058,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 */