X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_cache.c;h=321747dee17451f53e569e10a92035cadf780d91;hb=42ca41a0798e3a2b742f7da3bacc03fbaf6175fa;hp=7054ae4fa9a9f83caba9b4a2e6d01c53e01d9a60;hpb=6164fe4456716e6dc36aaa2ab617b104a7ac5ff3;p=collectd.git diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c index 7054ae4f..321747de 100644 --- a/src/daemon/utils_cache.c +++ b/src/daemon/utils_cache.c @@ -1,6 +1,7 @@ /** * collectd - src/utils_cache.c * Copyright (C) 2007-2010 Florian octo Forster + * Copyright (C) 2016 Sebastian tokkee Harl * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -22,6 +23,7 @@ * * Authors: * Florian octo Forster + * Sebastian tokkee Harl **/ #include "collectd.h" @@ -47,7 +49,7 @@ typedef struct cache_entry_s * (for purging old entries) */ cdtime_t last_update; /* Interval in which the data is collected - * (for purding old entries) */ + * (for purging old entries) */ cdtime_t interval; int state; int hits; @@ -68,6 +70,13 @@ typedef struct cache_entry_s meta_data_t *meta; } cache_entry_t; +struct uc_iter_s { + c_avl_iterator_t *iter; + + char *name; + cache_entry_t *entry; +}; + static c_avl_tree_t *cache_tree = NULL; static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER; @@ -83,13 +92,12 @@ static cache_entry_t *cache_alloc (size_t values_num) { cache_entry_t *ce; - ce = (cache_entry_t *) malloc (sizeof (cache_entry_t)); + ce = calloc (1, sizeof (*ce)); if (ce == NULL) { - ERROR ("utils_cache: cache_alloc: malloc failed."); + ERROR ("utils_cache: cache_alloc: calloc failed."); return (NULL); } - memset (ce, '\0', sizeof (cache_entry_t)); ce->values_num = values_num; ce->values_gauge = calloc (values_num, sizeof (*ce->values_gauge)); @@ -247,7 +255,7 @@ int uc_check_timeout (void) int status; int i; - + pthread_mutex_lock (&cache_lock); now = cdtime (); @@ -264,7 +272,7 @@ int uc_check_timeout (void) continue; /* If entry has not been updated, add to `keys' array */ - tmp = (char **) realloc ((void *) keys, + tmp = realloc ((void *) keys, (keys_len + 1) * sizeof (char *)); if (tmp == NULL) { @@ -499,7 +507,7 @@ int uc_get_rate_by_name (const char *name, gauge_t **ret_values, size_t *ret_val else { ret_num = ce->values_num; - ret = (gauge_t *) malloc (ret_num * sizeof (gauge_t)); + ret = malloc (ret_num * sizeof (*ret)); if (ret == NULL) { ERROR ("utils_cache: uc_get_rate_by_name: malloc failed."); @@ -691,7 +699,7 @@ int uc_set_state (const data_set_t *ds, const value_list_t *vl, int state) if (FORMAT_VL (name, sizeof (name), vl) != 0) { - ERROR ("uc_get_state: FORMAT_VL failed."); + ERROR ("uc_set_state: FORMAT_VL failed."); return (STATE_ERROR); } @@ -736,7 +744,6 @@ int uc_get_history_by_name (const char *name, if (ce->history_length < num_steps) { gauge_t *tmp; - size_t i; tmp = realloc (ce->history, sizeof (*ce->history) * num_steps * ce->values_num); @@ -800,7 +807,7 @@ int uc_get_hits (const data_set_t *ds, const value_list_t *vl) if (FORMAT_VL (name, sizeof (name), vl) != 0) { - ERROR ("uc_get_state: FORMAT_VL failed."); + ERROR ("uc_get_hits: FORMAT_VL failed."); return (STATE_ERROR); } @@ -825,7 +832,7 @@ int uc_set_hits (const data_set_t *ds, const value_list_t *vl, int hits) if (FORMAT_VL (name, sizeof (name), vl) != 0) { - ERROR ("uc_get_state: FORMAT_VL failed."); + ERROR ("uc_set_hits: FORMAT_VL failed."); return (STATE_ERROR); } @@ -851,7 +858,7 @@ int uc_inc_hits (const data_set_t *ds, const value_list_t *vl, int step) if (FORMAT_VL (name, sizeof (name), vl) != 0) { - ERROR ("uc_get_state: FORMAT_VL failed."); + ERROR ("uc_inc_hits: FORMAT_VL failed."); return (STATE_ERROR); } @@ -870,6 +877,104 @@ int uc_inc_hits (const data_set_t *ds, const value_list_t *vl, int step) } /* int uc_inc_hits */ /* + * Iterator interface + */ +uc_iter_t *uc_get_iterator () +{ + uc_iter_t *iter; + + iter = (uc_iter_t *) calloc(1, sizeof (*iter)); + if (iter == NULL) + return (NULL); + + pthread_mutex_lock (&cache_lock); + + iter->iter = c_avl_get_iterator (cache_tree); + if (iter->iter == NULL) + { + free (iter); + return (NULL); + } + + return (iter); +} /* uc_iter_t *uc_get_iterator */ + +int uc_iterator_next (uc_iter_t *iter, char **ret_name) +{ + int status; + + if (iter == NULL) + return (-1); + + while ((status = c_avl_iterator_next (iter->iter, + (void *) &iter->name, (void *) &iter->entry)) == 0) + { + if (iter->entry->state == STATE_MISSING) + continue; + + break; + } + if (status != 0) { + iter->name = NULL; + iter->entry = NULL; + return (-1); + } + + if (ret_name != NULL) + *ret_name = iter->name; + + return (0); +} /* int uc_iterator_next */ + +void uc_iterator_destroy (uc_iter_t *iter) +{ + if (iter == NULL) + return; + + c_avl_iterator_destroy (iter->iter); + pthread_mutex_unlock (&cache_lock); + + free (iter); +} /* void uc_iterator_destroy */ + +int uc_iterator_get_time (uc_iter_t *iter, cdtime_t *ret_time) +{ + if ((iter == NULL) || (iter->entry == NULL) || (ret_time == NULL)) + return (-1); + + *ret_time = iter->entry->last_time; + return (0); +} /* int uc_iterator_get_name */ + +int uc_iterator_get_values (uc_iter_t *iter, value_t **ret_values, size_t *ret_num) +{ + size_t i; + + if ((iter == NULL) || (iter->entry == NULL) + || (ret_values == NULL) || (ret_num == NULL)) + return (-1); + + *ret_values = calloc (iter->entry->values_num, sizeof(*iter->entry->values_raw)); + if (*ret_values == NULL) + return (-1); + for (i = 0; i < iter->entry->values_num; ++i) + *ret_values[i] = iter->entry->values_raw[i]; + + *ret_num = iter->entry->values_num; + + return (0); +} /* int uc_iterator_get_values */ + +int uc_iterator_get_interval (uc_iter_t *iter, cdtime_t *ret_interval) +{ + if ((iter == NULL) || (iter->entry == NULL) || (ret_interval == NULL)) + return (-1); + + *ret_interval = iter->entry->interval; + return (0); +} /* int uc_iterator_get_name */ + +/* * Meta data interface */ /* XXX: This function will acquire `cache_lock' but will not free it! */