]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Tree wide: Remove `up_down_counter_fp_t` and use `double` instead.
authorFlorian Forster <octo@collectd.org>
Wed, 21 Feb 2024 08:55:04 +0000 (09:55 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 21 Feb 2024 20:36:32 +0000 (21:36 +0100)
src/daemon/metric.h
src/utils/common/common.c

index 3e1fcfc0a28d58d738b9d0490b5d06e20ececdfb..dce8797340b9b5147b3b73a372c004037bf1e509 100644 (file)
@@ -72,14 +72,13 @@ typedef double gauge_t;
 typedef uint64_t counter_t;
 typedef double fpcounter_t;
 typedef int64_t derive_t;
-typedef double up_down_counter_fp_t;
 
 union value_u {
   gauge_t gauge;
   counter_t counter;
   fpcounter_t counter_fp;
   int64_t up_down;
-  up_down_counter_fp_t up_down_fp;
+  double up_down_fp;
   // For collectd 5 compatiblity. Treated the same as up_down.
   derive_t derive;
 };
index f261bc351c08883055dc54cf82d0f2a693b41c52..16785390ceafaac6c835443e4c2637bb269aeb34 100644 (file)
@@ -973,7 +973,7 @@ int parse_value(char const *value, value_t *ret_value, metric_type_t type) {
     break;
 
   case METRIC_TYPE_UP_DOWN_FP:
-    ret_value->up_down_fp = (up_down_counter_fp_t)strtod(value, &endptr);
+    ret_value->up_down_fp = (double)strtod(value, &endptr);
     break;
 
   case METRIC_TYPE_UNTYPED:
@@ -1243,7 +1243,7 @@ int rate_to_value(value_t *ret_value, gauge_t rate, /* {{{ */
       state->residual = rate - ((gauge_t)state->last_value.up_down);
       break;
     case METRIC_TYPE_UP_DOWN_FP:
-      state->last_value.up_down_fp = (up_down_counter_fp_t)rate;
+      state->last_value.up_down_fp = (double)rate;
       state->residual = 0;
       break;
     case METRIC_TYPE_UNTYPED:
@@ -1278,7 +1278,7 @@ int rate_to_value(value_t *ret_value, gauge_t rate, /* {{{ */
     break;
   }
   case METRIC_TYPE_UP_DOWN_FP: {
-    up_down_counter_fp_t delta = (up_down_counter_fp_t)delta_gauge;
+    double delta = (double)delta_gauge;
     state->last_value.up_down_fp += delta;
     state->residual = 0;
     break;
@@ -1319,7 +1319,7 @@ static int calculate_rate(gauge_t *ret_rate, value_t value, metric_type_t type,
     return 0;
   }
   case METRIC_TYPE_UP_DOWN_FP: {
-    up_down_counter_fp_t diff = value.up_down_fp - state->last_value.up_down_fp;
+    double diff = value.up_down_fp - state->last_value.up_down_fp;
     *ret_rate = ((gauge_t)diff) / ((gauge_t)interval);
     return 0;
   }