From: Svetlana Shmidt Date: Tue, 18 Aug 2020 14:00:48 +0000 (+0000) Subject: fix code style X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93fb6a83172362592b07f5698e01bd1679aba2ac;p=thirdparty%2Fcollectd.git fix code style --- diff --git a/src/daemon/distribution.c b/src/daemon/distribution.c index f5d6bf04a..545c370a5 100644 --- a/src/daemon/distribution.c +++ b/src/daemon/distribution.c @@ -32,7 +32,8 @@ struct distribution_s { bucket_t *tree; size_t num_buckets; double total_sum; - double total_square_sum; //the sum of squares of gauges. We'll need it to calculate sum of squared deviations + double total_square_sum; // the sum of squares of gauges. We'll need it to + // calculate sum of squared deviations pthread_mutex_t mutex; }; @@ -313,14 +314,14 @@ double distribution_total_sum(distribution_t *dist) { if (dist == NULL) { return NAN; } - return dist->total_sum; //should I add mutex here? + return dist->total_sum; // should I add mutex here? } double distribution_total_counter(distribution_t *dist) { if (dist == NULL) { return NAN; } - return dist->tree[0].bucket_counter; //should I add mutex here? + return dist->tree[0].bucket_counter; // should I add mutex here? } double distribution_squared_deviation_sum(distribution_t *dist) { @@ -329,7 +330,9 @@ 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) - 2 * mean * dist->total_sum + dist->total_square_sum; + double squared_deviation_sum = + mean * mean * 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_test.c b/src/daemon/distribution_test.c index 659a4d6a5..3f3dd9e92 100644 --- a/src/daemon/distribution_test.c +++ b/src/daemon/distribution_test.c @@ -486,48 +486,56 @@ DEF_TEST(getters) { double want_squared_deviation_sum; } cases[] = { { - .dist = distribution_new_linear(5, 7), - .num_buckets = 5, - .num_gauges = 1, - .update_gauges = (double[]){4}, - .want_counter = 1, - .want_total_sum = 4, - .want_average = 4, - .want_squared_deviation_sum = 0, - }, - { - .dist = distribution_new_exponential(5, 2, 1), - .num_buckets = 5, - .num_gauges = 7, - .update_gauges = (double[]){5, 17.4, 22.3, 11, 0.5, 13, 11}, - .want_counter = 7, - .want_total_sum = 80.2, - .want_average = 80.2 / 7, - .want_squared_deviation_sum = 7 * 80.2 / 7 * 80.2 / 7 - 2 * 80.2 / 7 * 80.2 + 1236.3, - }, - { - .dist = distribution_new_linear(100, 10), - .num_buckets = 100, - .num_gauges = 10, - .update_gauges = (double[]){5, 11.23, 29.48, 66.77, 11.22, 33.21, 55, 26.27, 96, 2}, - .want_counter = 10, - .want_total_sum = 336.18, - .want_average = 33.618, - .want_squared_deviation_sum = 10 * 336.18 / 10 * 336.18 / 10 - 2 * 336.18 / 10 * 336.18 + 19642.3216, + .dist = distribution_new_linear(5, 7), + .num_buckets = 5, + .num_gauges = 1, + .update_gauges = (double[]){4}, + .want_counter = 1, + .want_total_sum = 4, + .want_average = 4, + .want_squared_deviation_sum = 0, + }, + { + .dist = distribution_new_exponential(5, 2, 1), + .num_buckets = 5, + .num_gauges = 7, + .update_gauges = (double[]){5, 17.4, 22.3, 11, 0.5, 13, 11}, + .want_counter = 7, + .want_total_sum = 80.2, + .want_average = 80.2 / 7, + .want_squared_deviation_sum = + 7 * 80.2 / 7 * 80.2 / 7 - 2 * 80.2 / 7 * 80.2 + 1236.3, + }, + { + .dist = distribution_new_linear(100, 10), + .num_buckets = 100, + .num_gauges = 10, + .update_gauges = (double[]){5, 11.23, 29.48, 66.77, 11.22, 33.21, 55, + 26.27, 96, 2}, + .want_counter = 10, + .want_total_sum = 336.18, + .want_average = 33.618, + .want_squared_deviation_sum = 10 * 336.18 / 10 * 336.18 / 10 - + 2 * 336.18 / 10 * 336.18 + 19642.3216, }, }; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) { - EXPECT_EQ_INT(distribution_num_buckets(cases[i].dist), cases[i].num_buckets); + EXPECT_EQ_INT(distribution_num_buckets(cases[i].dist), + cases[i].num_buckets); for (size_t j = 0; j < cases[i].num_gauges; j++) { distribution_update(cases[i].dist, cases[i].update_gauges[j]); } - EXPECT_EQ_INT(distribution_total_counter(cases[i].dist), cases[i].want_counter); - EXPECT_EQ_DOUBLE(distribution_total_sum(cases[i].dist), cases[i].want_total_sum); - EXPECT_EQ_DOUBLE(distribution_average(cases[i].dist), cases[i].want_average); - EXPECT_EQ_DOUBLE(distribution_squared_deviation_sum(cases[i].dist), cases[i].want_squared_deviation_sum); + EXPECT_EQ_INT(distribution_total_counter(cases[i].dist), + cases[i].want_counter); + EXPECT_EQ_DOUBLE(distribution_total_sum(cases[i].dist), + cases[i].want_total_sum); + EXPECT_EQ_DOUBLE(distribution_average(cases[i].dist), + cases[i].want_average); + EXPECT_EQ_DOUBLE(distribution_squared_deviation_sum(cases[i].dist), + cases[i].want_squared_deviation_sum); distribution_destroy(cases[i].dist); - } + } return 0; } int main() {