From: Florian Forster Date: Tue, 28 Jul 2020 19:14:02 +0000 (+0200) Subject: Tree wide: uc_get_rate → uc_get_rate_vl X-Git-Tag: 6.0.0-rc0~144^2~101 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f188599cde9ec112400e9a4d00ded0b438a800c6;p=thirdparty%2Fcollectd.git Tree wide: uc_get_rate → uc_get_rate_vl --- diff --git a/src/aggregation.c b/src/aggregation.c index e2f8ff1c3..308df7448 100644 --- a/src/aggregation.c +++ b/src/aggregation.c @@ -30,7 +30,7 @@ #include "utils/common/common.h" #include "utils/lookup/vl_lookup.h" #include "utils/metadata/meta_data.h" -#include "utils_cache.h" /* for uc_get_rate() */ +#include "utils_cache.h" /* for uc_get_rate_vl() */ #include "utils_subst.h" #define AGG_MATCHES_ALL(str) (strcmp("/.*/", str) == 0) @@ -292,7 +292,7 @@ static int agg_instance_update(agg_instance_t *inst, /* {{{ */ return EINVAL; } - gauge_t *rate = uc_get_rate(ds, vl); + gauge_t *rate = uc_get_rate_vl(ds, vl); if (rate == NULL) { char ident[6 * DATA_MAX_NAME_LEN]; FORMAT_VL(ident, sizeof(ident), vl); diff --git a/src/csv.c b/src/csv.c index 612241421..dd2bd9ec4 100644 --- a/src/csv.c +++ b/src/csv.c @@ -65,10 +65,10 @@ static int value_list_to_string(char *buffer, int buffer_len, vl->values[i].gauge); } else if (store_rates != 0) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { WARNING("csv plugin: " - "uc_get_rate failed."); + "uc_get_rate_vl failed."); return -1; } status = snprintf(buffer + offset, buffer_len - offset, ",%lf", rates[i]); diff --git a/src/match_value.c b/src/match_value.c index 7b9da6930..c07ad4e5e 100644 --- a/src/match_value.c +++ b/src/match_value.c @@ -252,7 +252,7 @@ static int mv_match(const data_set_t *ds, const value_list_t *vl, /* {{{ */ m = *user_data; - values = uc_get_rate(ds, vl); + values = uc_get_rate_vl(ds, vl); if (values == NULL) { ERROR("`value' match: Retrieving the current rate from the cache " "failed."); diff --git a/src/postgresql.c b/src/postgresql.c index e9575cd2f..1495a99b8 100644 --- a/src/postgresql.c +++ b/src/postgresql.c @@ -727,7 +727,7 @@ static char *values_to_sqlarray(const data_set_t *ds, const value_list_t *vl, ssnprintf(str_ptr, str_len, "," GAUGE_FORMAT, vl->values[i].gauge); else if (store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { log_err("c_psql_write: Failed to determine rate"); diff --git a/src/target_notification.c b/src/target_notification.c index 6d8059ea7..8d7f903ed 100644 --- a/src/target_notification.c +++ b/src/target_notification.c @@ -227,7 +227,7 @@ static int tn_invoke(const data_set_t *ds, value_list_t *vl, /* {{{ */ if (ds->ds[i].type != DS_TYPE_GAUGE) { if ((rates == NULL) && (rates_failed == 0)) { - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) rates_failed = 1; } diff --git a/src/threshold.c b/src/threshold.c index e74dfc2ca..cf40a882b 100644 --- a/src/threshold.c +++ b/src/threshold.c @@ -630,7 +630,7 @@ static int ut_check_threshold(const data_set_t *ds, const value_list_t *vl, DEBUG("ut_check_threshold: Found matching threshold(s)"); - values = uc_get_rate(ds, vl); + values = uc_get_rate_vl(ds, vl); if (values == NULL) return 0; diff --git a/src/utils/common/common.c b/src/utils/common/common.c index 015bb51ac..6bb151d08 100644 --- a/src/utils/common/common.c +++ b/src/utils/common/common.c @@ -919,9 +919,9 @@ int format_values(char *ret, size_t ret_len, /* {{{ */ strbuf_printf(&buf, ":" GAUGE_FORMAT, vl->values[i].gauge); } else if (store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - WARNING("format_values: uc_get_rate failed."); + WARNING("format_values: uc_get_rate_vl failed."); return -1; } strbuf_printf(&buf, ":" GAUGE_FORMAT, rates[i]); diff --git a/src/utils/format_graphite/format_graphite.c b/src/utils/format_graphite/format_graphite.c index ec7b08924..767befbf0 100644 --- a/src/utils/format_graphite/format_graphite.c +++ b/src/utils/format_graphite/format_graphite.c @@ -301,9 +301,9 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, gauge_t *rates = NULL; if (flags & GRAPHITE_STORE_RATES) { - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - P_ERROR("format_graphite: error with uc_get_rate"); + P_ERROR("format_graphite: error with uc_get_rate_vl"); return -1; } } diff --git a/src/utils/format_json/format_json.c b/src/utils/format_json/format_json.c index 3ac3205a1..ee40db7b7 100644 --- a/src/utils/format_json/format_json.c +++ b/src/utils/format_json/format_json.c @@ -118,9 +118,9 @@ static int values_to_json(char *buffer, size_t buffer_size, /* {{{ */ BUFFER_ADD("null"); } else if (store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - WARNING("utils_format_json: uc_get_rate failed."); + WARNING("utils_format_json: uc_get_rate_vl failed."); sfree(rates); return -1; } diff --git a/src/utils/format_kairosdb/format_kairosdb.c b/src/utils/format_kairosdb/format_kairosdb.c index 51e8d925d..800c28b45 100644 --- a/src/utils/format_kairosdb/format_kairosdb.c +++ b/src/utils/format_kairosdb/format_kairosdb.c @@ -129,9 +129,9 @@ static int values_to_kairosdb(char *buffer, size_t buffer_size, /* {{{ */ } } else if (store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - WARNING("utils_format_kairosdb: uc_get_rate failed for %s|%s|%s|%s|%s", + WARNING("utils_format_kairosdb: uc_get_rate_vl failed for %s|%s|%s|%s|%s", vl->plugin, vl->plugin_instance, vl->type, vl->type_instance, ds->ds[ds_idx].name); diff --git a/src/write_influxdb_udp.c b/src/write_influxdb_udp.c index 32c8699a3..4d8e4d01f 100644 --- a/src/write_influxdb_udp.c +++ b/src/write_influxdb_udp.c @@ -428,10 +428,10 @@ static int write_influxdb_point(char *buffer, int buffer_len, have_values = true; } else if (wifxudp_config_store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { WARNING("write_influxdb_udp plugin: " - "uc_get_rate failed."); + "uc_get_rate_vl failed."); return -1; } if (isnan(rates[i])) diff --git a/src/write_mongodb.c b/src/write_mongodb.c index 34611b752..c3bd3bf13 100644 --- a/src/write_mongodb.c +++ b/src/write_mongodb.c @@ -75,9 +75,9 @@ static bson_t *wm_create_bson(const data_set_t *ds, /* {{{ */ } if (store_rates) { - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - ERROR("write_mongodb plugin: uc_get_rate() failed."); + ERROR("write_mongodb plugin: uc_get_rate_vl() failed."); bson_destroy(ret); return NULL; } diff --git a/src/write_riemann.c b/src/write_riemann.c index 2d8b31bf4..97f3a4096 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -431,9 +431,9 @@ wrr_value_list_to_message(struct riemann_host const *host, /* {{{ */ } if (host->store_rates) { - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - ERROR("write_riemann plugin: uc_get_rate failed."); + ERROR("write_riemann plugin: uc_get_rate_vl failed."); riemann_message_free(msg); return NULL; } diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c index 041ed7d5a..742379d81 100644 --- a/src/write_riemann_threshold.c +++ b/src/write_riemann_threshold.c @@ -205,7 +205,7 @@ int write_riemann_threshold_check(const data_set_t *ds, const value_list_t *vl, DEBUG("ut_check_threshold: Found matching threshold(s)"); - values = uc_get_rate(ds, vl); + values = uc_get_rate_vl(ds, vl); if (values == NULL) return 0; diff --git a/src/write_sensu.c b/src/write_sensu.c index 5a2065f12..51d1c5d73 100644 --- a/src/write_sensu.c +++ b/src/write_sensu.c @@ -931,9 +931,9 @@ static int sensu_write(const data_set_t *ds, /* {{{ */ memset(statuses, 0, vl->values_len * sizeof(*statuses)); if (host->store_rates) { - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { - ERROR("write_sensu plugin: uc_get_rate failed."); + ERROR("write_sensu plugin: uc_get_rate_vl failed."); pthread_mutex_unlock(&host->lock); return -1; } diff --git a/src/write_syslog.c b/src/write_syslog.c index b1daf412a..c5d75a1d2 100644 --- a/src/write_syslog.c +++ b/src/write_syslog.c @@ -346,10 +346,10 @@ static int ws_format_values(char *ret, size_t ret_len, int ds_num, BUFFER_ADD(GAUGE_FORMAT, vl->values[ds_num].gauge); else if (store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { WARNING("format_values: " - "uc_get_rate failed."); + "uc_get_rate_vl failed."); return -1; } BUFFER_ADD(GAUGE_FORMAT, rates[ds_num]); diff --git a/src/write_tsdb.c b/src/write_tsdb.c index 43d09bab6..da887241b 100644 --- a/src/write_tsdb.c +++ b/src/write_tsdb.c @@ -339,10 +339,10 @@ static int wt_format_values(char *ret, size_t ret_len, int ds_num, BUFFER_ADD(GAUGE_FORMAT, vl->values[ds_num].gauge); else if (store_rates) { if (rates == NULL) - rates = uc_get_rate(ds, vl); + rates = uc_get_rate_vl(ds, vl); if (rates == NULL) { WARNING("format_values: " - "uc_get_rate failed."); + "uc_get_rate_vl failed."); return -1; } BUFFER_ADD(GAUGE_FORMAT, rates[ds_num]);