projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
procevent plugin initial commit
[collectd.git]
/
src
/
daemon
/
utils_cache.c
diff --git
a/src/daemon/utils_cache.c
b/src/daemon/utils_cache.c
index
610c11e
..
351c3a0
100644
(file)
--- a/
src/daemon/utils_cache.c
+++ b/
src/daemon/utils_cache.c
@@
-28,10
+28,10
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
-#include "meta_data.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
#include "utils_cache.h"
#include <assert.h>
#include "utils_cache.h"
#include <assert.h>
@@
-201,7
+201,11
@@
static int uc_insert(const data_set_t *ds, const value_list_t *vl,
ce->last_time = vl->time;
ce->last_update = cdtime();
ce->interval = vl->interval;
ce->last_time = vl->time;
ce->last_update = cdtime();
ce->interval = vl->interval;
- ce->state = STATE_OKAY;
+ ce->state = STATE_UNKNOWN;
+
+ if (vl->meta != NULL) {
+ ce->meta = meta_data_clone(vl->meta);
+ }
if (c_avl_insert(cache_tree, key_copy, ce) != 0) {
sfree(key_copy);
if (c_avl_insert(cache_tree, key_copy, ce) != 0) {
sfree(key_copy);
@@
-275,7
+279,8
@@
int uc_check_timeout(void) {
* plugin calls the cache interface. */
for (size_t i = 0; i < expired_num; i++) {
value_list_t vl = {
* plugin calls the cache interface. */
for (size_t i = 0; i < expired_num; i++) {
value_list_t vl = {
- .time = expired[i].time, .interval = expired[i].interval,
+ .time = expired[i].time,
+ .interval = expired[i].interval,
};
if (parse_identifier_vl(expired[i].key, &vl) != 0) {
};
if (parse_identifier_vl(expired[i].key, &vl) != 0) {
@@
-826,9
+831,7
@@
int uc_inc_hits(const data_set_t *ds, const value_list_t *vl, int step) {
* Iterator interface
*/
uc_iter_t *uc_get_iterator(void) {
* Iterator interface
*/
uc_iter_t *uc_get_iterator(void) {
- uc_iter_t *iter;
-
- iter = (uc_iter_t *)calloc(1, sizeof(*iter));
+ uc_iter_t *iter = calloc(1, sizeof(*iter));
if (iter == NULL)
return NULL;
if (iter == NULL)
return NULL;
@@
-891,13
+894,12
@@
int uc_iterator_get_values(uc_iter_t *iter, value_t **ret_values,
if ((iter == NULL) || (iter->entry == NULL) || (ret_values == NULL) ||
(ret_num == NULL))
return -1;
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 (size_t i = 0; i < iter->entry->values_num; ++i)
*ret_values =
calloc(iter->entry->values_num, sizeof(*iter->entry->values_raw));
if (*ret_values == NULL)
return -1;
for (size_t i = 0; i < iter->entry->values_num; ++i)
-
*ret_values
[i] = iter->entry->values_raw[i];
+
(*ret_values)
[i] = iter->entry->values_raw[i];
*ret_num = iter->entry->values_num;
*ret_num = iter->entry->values_num;