Tree wide: uc_get_rate → uc_get_rate_vl

diff --git a/src/aggregation.c b/src/aggregation.c
index e2f8ff1c3d3a849cafa215e1984a533471b723ed..308df7448c1cfb6b6be27b13eff08977b637b717 100644 (file)
--- 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 6122414211747ebfaec466ef02f83abddf348f4b..dd2bd9ec41f7015dbb415ef658b324fcae07b054 100644 (file)
--- 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 7b9da693097d4884a73ffadbbe896887c79e5b75..c07ad4e5e65a25ffdb12639287b03246fd58d4e0 100644 (file)
--- 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 e9575cd2f2a678fabbba2b8f269189cbda1676ab..1495a99b889f7fab21b349db1fdc2d551399e870 100644 (file)
--- 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 6d8059ea723f121a5d69ab43bafb914e9090dfd6..8d7f903ed571863ffa40efd5c9baa69176b6a4b5 100644 (file)
--- 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 e74dfc2ca2587001642f3cc13ca5b2bdb856eba5..cf40a882bf83383029035868a51970f8565f4800 100644 (file)
--- 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 015bb51acd36ae8a6684fe28f2b209046c65ecbc..6bb151d084a48d4e3b4ff3e8e586ce1d592232fc 100644 (file)
--- 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 ec7b08924e9193486103bcb05b999dcd130d7dbd..767befbf0c5088b76ab0083700e5f0d643ce5ffc 100644 (file)
--- 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 3ac3205a12e4ae9e5c38f87db6b40973ae747a20..ee40db7b758c284eeb6769d7907c4d5b3eabd64d 100644 (file)
--- 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 51e8d925d13f8f43c8724cb69526bcd70d912350..800c28b45ba475878d8380cb2f75c33c39927467 100644 (file)
--- 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 32c8699a32ef0b6f5e33d09146fd86823a2b3763..4d8e4d01f948b9e6d583f8f00b9e1e8fa6e38382 100644 (file)
--- 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 34611b752cb7c63dcd6b7e57df5432ef3f869be9..c3bd3bf139040092dff89911b0a1db04cd9bedbf 100644 (file)
--- 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 2d8b31bf42d8bf32e27f248660014286c8e9b17b..97f3a409656dd360b09d8ce438f572ae0a772b5e 100644 (file)
--- 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 041ed7d5ad7de462300179ab22a6a24498a77ae8..742379d81547e81b0e5535e900df810e40fd9ccd 100644 (file)
--- 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 5a2065f12764fed4fc4801c29f6af77f057b07c2..51d1c5d739cf7a252007ee332a093099452367ed 100644 (file)
--- 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 b1daf412a8375c192b89e353dcad9ed4f5413cd7..c5d75a1d24274eed1a807ba8d7f153cf6ca219f5 100644 (file)
--- 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 43d09bab68ac7b271ffcead78e22b85cb652c94b..da887241b2e66078b7131f1d61131d2f48f250a0 100644 (file)
--- 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]);