Fixed return type of distribution_total_counter from double to uint64_t and added...

diff --git a/src/daemon/distribution.c b/src/daemon/distribution.c
index c21c43b3aa41602d671bdcd31ed93a5a4fbf7651..36933e3698cde24d33f8cf3183768acbab92588d 100644 (file)
--- a/src/daemon/distribution.c
+++ b/src/daemon/distribution.c
@@ -319,7 +319,7 @@ double distribution_total_sum(distribution_t *dist) {
 
 uint64_t distribution_total_counter(distribution_t *dist) {
   if (dist == NULL) {
-    return NAN;
+    return EINVAL;
   }
   return dist->tree[0].bucket_counter; // should I add mutex here?
 }
@@ -331,7 +331,7 @@ double distribution_squared_deviation_sum(distribution_t *dist) {
   double mean = distribution_average(dist);
   pthread_mutex_lock(&dist->mutex);
   double squared_deviation_sum =
-      mean * mean * distribution_total_counter(dist) -
+      mean * mean * (double) distribution_total_counter(dist) -
       2 * mean * dist->total_sum + dist->total_square_sum;
   pthread_mutex_unlock(&dist->mutex);
   return squared_deviation_sum;

diff --git a/src/daemon/distribution.h b/src/daemon/distribution.h
index 40370403b904a5fb1d4ea206016d44d7860e78e3..5b3f5dee4e0568eb169b100f09603fdabb89c4b5 100644 (file)
--- a/src/daemon/distribution.h
+++ b/src/daemon/distribution.h
@@ -120,4 +120,4 @@ void destroy_buckets_array(buckets_array_t buckets_array);
 
 /* TODO(bkjg): add description */
 int distribution_sub(distribution_t *d1, distribution_t *d2);
-#endif // COLLECTD_DISTRIBUTION_H
+#endif // COLLECTD_DISTRIBUTION_Hs
\ No newline at end of file