Merge branch 'collectd-4.2' into collectd-4.3

[collectd.git] / src / utils_cache.c

diff --git a/src/utils_cache.c b/src/utils_cache.c
index 77b38eb..0d6961e 100644 (file)
--- a/src/utils_cache.c
+++ b/src/utils_cache.c
@@ -47,7 +47,7 @@ typedef struct cache_entry_s
        int state;
 } cache_entry_t;
 
-static avl_tree_t     *cache_tree = NULL;
+static c_avl_tree_t   *cache_tree = NULL;
 static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static int cache_compare (const cache_entry_t *a, const cache_entry_t *b)
@@ -70,8 +70,6 @@ static int uc_send_notification (const char *name)
 
   notification_t n;
 
-  memset (&n, '\0', sizeof (n));
-
   name_copy = strdup (name);
   if (name_copy == NULL)
   {
@@ -88,18 +86,23 @@ static int uc_send_notification (const char *name)
     return (-1);
   }
 
-  n.severity = NOTIF_FAILURE;
-  strncpy (n.host, host, sizeof (n.host));
-  n.host[sizeof (n.host) - 1] = '\0';
+  /* Copy the associative members */
+  notification_init (&n, NOTIF_FAILURE, /* host = */ NULL,
+      host, plugin, plugin_instance, type, type_instance);
 
   sfree (name_copy);
   name_copy = host = plugin = plugin_instance = type = type_instance = NULL;
 
   pthread_mutex_lock (&cache_lock);
 
+  /*
+   * Set the time _after_ getting the lock because we don't know how long
+   * acquiring the lock takes and we will use this time later to decide
+   * whether or not the state is OKAY.
+   */
   n.time = time (NULL);
 
-  status = avl_get (cache_tree, name, (void *) &ce);
+  status = c_avl_get (cache_tree, name, (void *) &ce);
   if (status != 0)
   {
     pthread_mutex_unlock (&cache_lock);
@@ -131,7 +134,7 @@ static int uc_send_notification (const char *name)
 int uc_init (void)
 {
   if (cache_tree == NULL)
-    cache_tree = avl_create ((int (*) (const void *, const void *))
+    cache_tree = c_avl_create ((int (*) (const void *, const void *))
        cache_compare);
 
   return (0);
@@ -146,7 +149,7 @@ int uc_check_timeout (void)
   int keys_len = 0;
 
   char *key;
-  avl_iterator_t *iter;
+  c_avl_iterator_t *iter;
   int i;
   
   pthread_mutex_lock (&cache_lock);
@@ -154,8 +157,8 @@ int uc_check_timeout (void)
   now = time (NULL);
 
   /* Build a list of entries to be flushed */
-  iter = avl_get_iterator (cache_tree);
-  while (avl_iterator_next (iter, (void *) &key, (void *) &ce) == 0)
+  iter = c_avl_get_iterator (cache_tree);
+  while (c_avl_iterator_next (iter, (void *) &key, (void *) &ce) == 0)
   {
     /* If entry has not been updated, add to `keys' array */
     if ((now - ce->last_update) >= (2 * ce->interval))
@@ -167,7 +170,7 @@ int uc_check_timeout (void)
       if (tmp == NULL)
       {
        ERROR ("uc_purge: realloc failed.");
-       avl_iterator_destroy (iter);
+       c_avl_iterator_destroy (iter);
        return (-1);
       }
 
@@ -180,7 +183,7 @@ int uc_check_timeout (void)
       }
       keys_len++;
     }
-  } /* while (avl_iterator_next) */
+  } /* while (c_avl_iterator_next) */
 
   for (i = 0; i < keys_len; i++)
   {
@@ -197,10 +200,10 @@ int uc_check_timeout (void)
     {
       ce = NULL;
       DEBUG ("uc_check_timeout: %s is missing but ``uninteresting''", keys[i]);
-      status = avl_remove (cache_tree, keys[i], (void *) &key, (void *) &ce);
+      status = c_avl_remove (cache_tree, keys[i], (void *) &key, (void *) &ce);
       if (status != 0)
       {
-       ERROR ("uc_check_timeout: avl_remove (%s) failed.", keys[i]);
+       ERROR ("uc_check_timeout: c_avl_remove (%s) failed.", keys[i]);
       }
       sfree (keys[i]);
       sfree (ce);
@@ -216,7 +219,7 @@ int uc_check_timeout (void)
     }
   } /* for (keys[i]) */
 
-  avl_iterator_destroy (iter);
+  c_avl_iterator_destroy (iter);
 
   pthread_mutex_unlock (&cache_lock);
 
@@ -248,7 +251,7 @@ int uc_update (const data_set_t *ds, const value_list_t *vl)
 
   pthread_mutex_lock (&cache_lock);
 
-  if (avl_get (cache_tree, name, (void *) &ce) == 0)
+  if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
   {
     int i;
 
@@ -356,10 +359,10 @@ int uc_update (const data_set_t *ds, const value_list_t *vl)
     ce->interval = vl->interval;
     ce->state = STATE_OKAY;
 
-    if (avl_insert (cache_tree, key, ce) != 0)
+    if (c_avl_insert (cache_tree, key, ce) != 0)
     {
       pthread_mutex_unlock (&cache_lock);
-      ERROR ("uc_insert: avl_insert failed.");
+      ERROR ("uc_insert: c_avl_insert failed.");
       return (-1);
     }
 
@@ -368,14 +371,26 @@ int uc_update (const data_set_t *ds, const value_list_t *vl)
 
   pthread_mutex_unlock (&cache_lock);
 
+  /* Do not send okay notifications for uninteresting values, i. e. values for
+   * which no threshold is configured. */
+  if (send_okay_notification > 0)
+  {
+    int status;
+
+    status = ut_check_interesting (name);
+    if (status <= 0)
+      send_okay_notification = 0;
+  }
+
   if (send_okay_notification > 0)
   {
     notification_t n;
     memset (&n, '\0', sizeof (n));
 
+    /* Copy the associative members */
+    NOTIFICATION_INIT_VL (&n, vl, ds);
+
     n.severity = NOTIF_OKAY;
-    strncpy (n.host, vl->host, sizeof (n.host));
-    n.host[sizeof (n.host) - 1] = '\0';
     n.time = vl->time;
 
     snprintf (n.message, sizeof (n.message),
@@ -403,7 +418,7 @@ gauge_t *uc_get_rate (const data_set_t *ds, const value_list_t *vl)
 
   pthread_mutex_lock (&cache_lock);
 
-  if (avl_get (cache_tree, name, (void *) &ce) == 0)
+  if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
   {
     assert (ce != NULL);
     assert (ce->values_num == ds->ds_num);
@@ -438,7 +453,7 @@ int uc_get_state (const data_set_t *ds, const value_list_t *vl)
 
   pthread_mutex_lock (&cache_lock);
 
-  if (avl_get (cache_tree, name, (void *) &ce) == 0)
+  if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
   {
     assert (ce != NULL);
     ret = ce->state;
@@ -468,7 +483,7 @@ int uc_set_state (const data_set_t *ds, const value_list_t *vl, int state)
 
   pthread_mutex_lock (&cache_lock);
 
-  if (avl_get (cache_tree, name, (void *) &ce) == 0)
+  if (c_avl_get (cache_tree, name, (void *) &ce) == 0)
   {
     assert (ce != NULL);
     ret = ce->state;