projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
daemon
/
utils_cache.c
diff --git
a/src/daemon/utils_cache.c
b/src/daemon/utils_cache.c
index
7b2f958
..
c4cef28
100644
(file)
--- a/
src/daemon/utils_cache.c
+++ b/
src/daemon/utils_cache.c
@@
-193,11
+193,13
@@
static int uc_insert (const data_set_t *ds, const value_list_t *vl,
/ CDTIME_T_TO_DOUBLE (vl->interval);
ce->values_raw[i].absolute = vl->values[i].absolute;
break;
/ CDTIME_T_TO_DOUBLE (vl->interval);
ce->values_raw[i].absolute = vl->values[i].absolute;
break;
-
+
default:
/* This shouldn't happen. */
ERROR ("uc_insert: Don't know how to handle data source type %i.",
ds->ds[i].type);
default:
/* This shouldn't happen. */
ERROR ("uc_insert: Don't know how to handle data source type %i.",
ds->ds[i].type);
+ sfree (key_copy);
+ cache_free (ce);
return (-1);
} /* switch (ds->ds[i].type) */
} /* for (i) */
return (-1);
} /* switch (ds->ds[i].type) */
} /* for (i) */
@@
-575,7
+577,7
@@
gauge_t *uc_get_rate (const data_set_t *ds, const value_list_t *vl)
return (ret);
} /* gauge_t *uc_get_rate */
return (ret);
} /* gauge_t *uc_get_rate */
-size_t uc_get_size
(
) {
+size_t uc_get_size
(void
) {
size_t size_arrays = 0;
pthread_mutex_lock (&cache_lock);
size_t size_arrays = 0;
pthread_mutex_lock (&cache_lock);
@@
-707,7
+709,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)
{
if (FORMAT_VL (name, sizeof (name), vl) != 0)
{
- ERROR ("uc_
g
et_state: FORMAT_VL failed.");
+ ERROR ("uc_
s
et_state: FORMAT_VL failed.");
return (STATE_ERROR);
}
return (STATE_ERROR);
}
@@
-752,7
+754,6
@@
int uc_get_history_by_name (const char *name,
if (ce->history_length < num_steps)
{
gauge_t *tmp;
if (ce->history_length < num_steps)
{
gauge_t *tmp;
- size_t i;
tmp = realloc (ce->history, sizeof (*ce->history)
* num_steps * ce->values_num);
tmp = realloc (ce->history, sizeof (*ce->history)
* num_steps * ce->values_num);
@@
-816,7
+817,7
@@
int uc_get_hits (const data_set_t *ds, const value_list_t *vl)
if (FORMAT_VL (name, sizeof (name), vl) != 0)
{
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);
}
return (STATE_ERROR);
}
@@
-841,7
+842,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)
{
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);
}
return (STATE_ERROR);
}
@@
-867,7
+868,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)
{
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);
}
return (STATE_ERROR);
}