Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / utils_cache.c

diff --git a/src/utils_cache.c b/src/utils_cache.c
index 7258ffb..a63c7d1 100644 (file)
--- a/src/utils_cache.c
+++ b/src/utils_cache.c
@@ -156,13 +156,12 @@ static int uc_send_notification (const char *name)
     return (-1);
   }
 
-  snprintf (n.message, sizeof (n.message),
+  ssnprintf (n.message, sizeof (n.message),
       "%s has not been updated for %i seconds.", name,
       (int) (n.time - ce->last_update));
 
   pthread_mutex_unlock (&cache_lock);
 
-  n.message[sizeof (n.message) - 1] = '\0';
   plugin_dispatch_notification (&n);
 
   return (0);
@@ -187,6 +186,7 @@ static int uc_insert (const data_set_t *ds, const value_list_t *vl,
   ce = cache_alloc (ds->ds_num);
   if (ce == NULL)
   {
+    sfree (key_copy);
     ERROR ("uc_insert: cache_alloc (%i) failed.", ds->ds_num);
     return (-1);
   }
@@ -262,6 +262,7 @@ int uc_check_timeout (void)
       {
        ERROR ("uc_purge: realloc failed.");
        c_avl_iterator_destroy (iter);
+       pthread_mutex_unlock (&cache_lock);
        return (-1);
       }
 
@@ -299,6 +300,7 @@ int uc_check_timeout (void)
        ERROR ("uc_check_timeout: c_avl_remove (%s) failed.", keys[i]);
       }
       sfree (keys[i]);
+      sfree (key);
       cache_free (ce);
     }
     else if (status == 1) /* persist */
@@ -325,7 +327,7 @@ int uc_check_timeout (void)
     }
     else
     {
-      WARNING ("uc_check_timeout: ut_check_interesting (%s) returned ",
+      WARNING ("uc_check_timeout: ut_check_interesting (%s) returned "
          "invalid status %i.",
          keys[i], status);
     }
@@ -450,10 +452,9 @@ int uc_update (const data_set_t *ds, const value_list_t *vl)
   n.severity = NOTIF_OKAY;
   n.time = vl->time;
 
-  snprintf (n.message, sizeof (n.message),
+  ssnprintf (n.message, sizeof (n.message),
       "Received a value for %s. It was missing for %u seconds.",
       name, (unsigned int) update_delay);
-  n.message[sizeof (n.message) - 1] = '\0';
 
   plugin_dispatch_notification (&n);
 
@@ -511,7 +512,7 @@ gauge_t *uc_get_rate (const data_set_t *ds, const value_list_t *vl)
 
   if (FORMAT_VL (name, sizeof (name), vl, ds) != 0)
   {
-    ERROR ("uc_insert: FORMAT_VL failed.");
+    ERROR ("utils_cache: uc_get_rate: FORMAT_VL failed.");
     return (NULL);
   }
 
@@ -521,10 +522,10 @@ gauge_t *uc_get_rate (const data_set_t *ds, const value_list_t *vl)
 
   /* This is important - the caller has no other way of knowing how many
    * values are returned. */
-  if (ret_num != ds->ds_num)
+  if (ret_num != (size_t) ds->ds_num)
   {
     ERROR ("utils_cache: uc_get_rate: ds[%s] has %i values, "
-       "but uc_get_rate_by_name returned %i.",
+       "but uc_get_rate_by_name returned %zu.",
        ds->type, ds->ds_num, ret_num);
     sfree (ret);
     return (NULL);
@@ -533,48 +534,66 @@ gauge_t *uc_get_rate (const data_set_t *ds, const value_list_t *vl)
   return (ret);
 } /* gauge_t *uc_get_rate */
 
-int uc_get_names (char ***ret_names, size_t *ret_names_num)
+int uc_get_names (char ***ret_names, time_t **ret_times, size_t *ret_number)
 {
   c_avl_iterator_t *iter;
   char *key;
-  void *value;
+  cache_entry_t *value;
 
   char **names = NULL;
-  size_t names_num = 0;
+  time_t *times = NULL;
+  size_t number = 0;
 
   int status = 0;
 
+  if ((ret_names == NULL) || (ret_number == NULL))
+    return (-1);
+
   pthread_mutex_lock (&cache_lock);
 
   iter = c_avl_get_iterator (cache_tree);
-  while (c_avl_iterator_next (iter, (void *) &key, &value) == 0)
+  while (c_avl_iterator_next (iter, (void *) &key, (void *) &value) == 0)
   {
     char **temp;
 
-    temp = (char **) realloc (names, sizeof (char *) * (names_num + 1));
+    if (ret_times != NULL)
+    {
+      time_t *tmp_times;
+
+      tmp_times = (time_t *) realloc (times, sizeof (time_t) * (number + 1));
+      if (tmp_times == NULL)
+      {
+       status = -1;
+       break;
+      }
+      times = tmp_times;
+      times[number] = value->last_time;
+    }
+
+    temp = (char **) realloc (names, sizeof (char *) * (number + 1));
     if (temp == NULL)
     {
       status = -1;
       break;
     }
     names = temp;
-    names[names_num] = strdup (key);
-    if (names[names_num] == NULL)
+    names[number] = strdup (key);
+    if (names[number] == NULL)
     {
       status = -1;
       break;
     }
-    names_num++;
-  }
+    number++;
+  } /* while (c_avl_iterator_next) */
 
   c_avl_iterator_destroy (iter);
   pthread_mutex_unlock (&cache_lock);
 
   if (status != 0)
   {
-    int i;
+    size_t i;
     
-    for (i = 0; i < names_num; i++)
+    for (i = 0; i < number; i++)
     {
       sfree (names[i]);
     }
@@ -584,7 +603,9 @@ int uc_get_names (char ***ret_names, size_t *ret_names_num)
   }
 
   *ret_names = names;
-  *ret_names_num = names_num;
+  if (ret_times != NULL)
+    *ret_times = times;
+  *ret_number = number;
 
   return (0);
 } /* int uc_get_names */