From c50d6c959301c7620f5044bcfe681c700f768c6d Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Fri, 16 Feb 2018 17:27:40 -0500 Subject: [PATCH] fixed possible division by zero and improved log output in swarm_suite --- test/swarm_suite.cpp | 13 +++++-------- test/swarm_suite.hpp | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/test/swarm_suite.cpp b/test/swarm_suite.cpp index 07fe464a4..7ee626d17 100644 --- a/test/swarm_suite.cpp +++ b/test/swarm_suite.cpp @@ -181,10 +181,9 @@ void test_swarm(test_flags_t const flags) TEST_CHECK(tor2.status().is_seeding); TEST_CHECK(tor3.status().is_seeding); - float average2 = sum_dl_rate2 / float(count_dl_rates2); - float average3 = sum_dl_rate3 / float(count_dl_rates3); + float average2 = count_dl_rates2 > 0 ? sum_dl_rate2 / float(count_dl_rates2) : -1; + float average3 = count_dl_rates3 > 0 ? sum_dl_rate3 / float(count_dl_rates3) : -1; - std::cout << average2 << std::endl; std::cout << "average rate: " << (average2 / 1000.f) << "kB/s - " << (average3 / 1000.f) << "kB/s" << std::endl; @@ -211,10 +210,9 @@ void test_swarm(test_flags_t const flags) , int(total_milliseconds(clock_type::now() - start))); std::vector alerts; ses1.pop_alerts(&alerts); - for (std::vector::iterator i = alerts.begin() - , end(alerts.end()); i != end; ++i) + for (auto ap : alerts) { - std::printf("%s\n", ret->message().c_str()); + std::printf("%s\n", ap->message().c_str()); } start = clock_type::now(); } @@ -227,7 +225,7 @@ void test_swarm(test_flags_t const flags) p2 = ses2.abort(); p3 = ses3.abort(); - time_point end = clock_type::now(); + time_point const end = clock_type::now(); std::printf("time: %d ms\n", int(total_milliseconds(end - start))); TEST_CHECK(end - start < milliseconds(3000)); @@ -245,4 +243,3 @@ void test_swarm(test_flags_t const flags) #ifdef _MSC_VER #pragma warning(pop) #endif - diff --git a/test/swarm_suite.hpp b/test/swarm_suite.hpp index 8966a63b6..8aa520c3a 100644 --- a/test/swarm_suite.hpp +++ b/test/swarm_suite.hpp @@ -45,5 +45,4 @@ namespace test_flags constexpr test_flags_t suggest{16}; } -void EXPORT test_swarm(test_flags_t flags = test_flags_t{}); - +EXPORT void test_swarm(test_flags_t flags = test_flags_t{});