X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/36fccba5f4f2b4c32e97c4e56911eb5bd804f7c9..b258d5c9c0df493362e405852089a923e5f450e6:/examples/cpp/io-degradation/s4u-io-degradation.cpp diff --git a/examples/cpp/io-degradation/s4u-io-degradation.cpp b/examples/cpp/io-degradation/s4u-io-degradation.cpp index 30ae4aa990..0e8e4b5030 100644 --- a/examples/cpp/io-degradation/s4u-io-degradation.cpp +++ b/examples/cpp/io-degradation/s4u-io-degradation.cpp @@ -21,7 +21,7 @@ namespace sg4 = simgrid::s4u; XBT_LOG_NEW_DEFAULT_CATEGORY(disk_test, "Messages specific for this simulation"); /** @brief Calculates the bandwidth for disk doing async operations */ -static void estimate_bw(sg4::Disk* disk, int n_flows, bool read) +static void estimate_bw(const sg4::Disk* disk, int n_flows, bool read) { unsigned long long size = 100000; double cur_time = sg4::Engine::get_clock(); @@ -36,11 +36,11 @@ static void estimate_bw(sg4::Disk* disk, int n_flows, bool read) activities.push_back(act); } - for (auto& act : activities) + for (const auto& act : activities) act->wait(); double elapsed_time = sg4::Engine::get_clock() - cur_time; - double estimated_bw = size * n_flows / elapsed_time; + double estimated_bw = static_cast(size * n_flows) / elapsed_time; XBT_INFO("Disk: %s, concurrent %s: %d, estimated bandwidth: %lf", disk->get_cname(), read ? "read" : "write", n_flows, estimated_bw); } @@ -49,7 +49,7 @@ static void host() { /* - Estimating bw for each disk and considering concurrent flows */ for (int n = 1; n < 15; n += 2) { - for (auto* disk : sg4::Host::current()->get_disks()) { + for (const auto* disk : sg4::Host::current()->get_disks()) { estimate_bw(disk, n, true); estimate_bw(disk, n, false); } @@ -66,7 +66,7 @@ static void host() * @param capacity Resource current capacity in SimGrid * @param n Number of activities sharing this resource */ -static double ssd_dynamic_sharing(const sg4::Disk* disk, const std::string& op, double capacity, int n) +static double ssd_dynamic_sharing(const sg4::Disk* /*disk*/, const std::string& op, double capacity, int n) { /* measurements for SSD disks */ using DiskCapacity = std::unordered_map; @@ -93,8 +93,6 @@ static double ssd_dynamic_sharing(const sg4::Disk* disk, const std::string& op, if (data.find(n) != data.end()) capacity = data.at(n); - // XBT_INFO("Disk %s, %s operation between %d flows, capacity %lf", disk->get_cname(), op.c_str(), n, capacity); - return capacity; } @@ -107,12 +105,9 @@ static double ssd_dynamic_sharing(const sg4::Disk* disk, const std::string& op, * @param capacity Resource current capacity in SimGrid * @param n Number of activities sharing this resource */ -static double sata_dynamic_sharing(const sg4::Disk* disk, double capacity, int n) +static double sata_dynamic_sharing(const sg4::Disk* /*disk*/, double /*capacity*/, int n) { - capacity = 68.3 - 1.7 * n; - // XBT_INFO("Disk %s, read operation between %d flows, capacity %lf", disk->get_cname(), n, capacity); - - return capacity; + return 68.3 - 1.7 * n; } /** @brief Creates an SSD disk, setting the appropriate callback for non-linear resource sharing */