/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <algorithm>
+
#include "network_cm02.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
all_existing_models->push_back(surf_network_model);
- xbt_cfg_setdefault_double("network/latency-factor", 13.01);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
- xbt_cfg_setdefault_double("network/weight-S", 20537);
+ simgrid::config::set_default<double>("network/latency-factor", 13.01);
+ simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+ simgrid::config::set_default<double>("network/weight-S", 20537);
}
/***************************************************************************/
if (surf_network_model)
return;
- xbt_cfg_setdefault_double("network/latency-factor", 1.0);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0);
- xbt_cfg_setdefault_double("network/weight-S", 0.0);
+ simgrid::config::set_default<double>("network/latency-factor", 1.0);
+ simgrid::config::set_default<double>("network/bandwidth-factor", 1.0);
+ simgrid::config::set_default<double>("network/weight-S", 0.0);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
all_existing_models->push_back(surf_network_model);
using namespace simgrid::kernel;
lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi);
- xbt_cfg_setdefault_double("network/latency-factor", 13.01);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
- xbt_cfg_setdefault_double("network/weight-S", 20537);
+ simgrid::config::set_default<double>("network/latency-factor", 13.01);
+ simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+ simgrid::config::set_default<double>("network/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
all_existing_models->push_back(surf_network_model);
using namespace simgrid::kernel;
lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi);
- xbt_cfg_setdefault_double("network/latency-factor", 13.01);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
- xbt_cfg_setdefault_double("network/weight-S", 20537);
+ simgrid::config::set_default<double>("network/latency-factor", 13.01);
+ simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+ simgrid::config::set_default<double>("network/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
all_existing_models->push_back(surf_network_model);
using namespace simgrid::kernel;
lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi);
- xbt_cfg_setdefault_double("network/latency-factor", 13.01);
- xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
- xbt_cfg_setdefault_double("network/weight-S", 20537);
+ simgrid::config::set_default<double>("network/latency-factor", 13.01);
+ simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+ simgrid::config::set_default<double>("network/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
all_existing_models->push_back(surf_network_model);
bool select = simgrid::config::get_value<bool>("network/maxmin-selective-update");
if (optim == "Lazy") {
- xbt_assert(select || xbt_cfg_is_default_value("network/maxmin-selective-update"),
+ xbt_assert(select || simgrid::config::is_default("network/maxmin-selective-update"),
"You cannot disable network selective update when using the lazy update mechanism");
select = true;
}
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
- int failed = 0;
+ bool failed = false;
double latency = 0.0;
std::vector<LinkImpl*> back_route;
std::vector<LinkImpl*> route;
"You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
src->get_cname(), dst->get_cname());
- for (auto const& link : route)
- if (link->is_off())
- failed = 1;
+ failed = std::any_of(route.begin(), route.end(), [](LinkImpl* link) { return link->is_off(); });
- if (cfg_crosstraffic == 1) {
+ if (cfg_crosstraffic) {
dst->routeTo(src, back_route, nullptr);
- for (auto const& link : back_route)
- if (link->is_off())
- failed = 1;
+ failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); });
}
NetworkCm02Action *action = new NetworkCm02Action(this, size, failed);
action->set_last_update();
}
- double bandwidth_bound = -1.0;
- if (sg_weight_S_parameter > 0)
- for (auto const& link : route)
- action->weight_ += sg_weight_S_parameter / link->bandwidth();
-
- for (auto const& link : route) {
- double bb = bandwidthFactor(size) * link->bandwidth();
- bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb);
+ if (sg_weight_S_parameter > 0) {
+ action->weight_ =
+ std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) {
+ return total + sg_weight_S_parameter / link->bandwidth();
+ });
}
+ double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth();
+
+ for (auto const& link : route)
+ bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth());
+
action->lat_current_ = action->latency_;
action->latency_ *= latencyFactor(size);
action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size);
if (get_update_algorithm() == Model::UpdateAlgo::Lazy) {
// add to the heap the event when the latency is payed
double date = action->latency_ + action->get_last_update();
- ActionHeap::Type type;
- if (route.empty())
- type = ActionHeap::Type::normal;
- else
- type = ActionHeap::Type::latency;
+
+ ActionHeap::Type type = route.empty() ? ActionHeap::Type::normal : ActionHeap::Type::latency;
XBT_DEBUG("Added action (%p) one latency event at date %f", action, date);
get_action_heap().insert(action, date, type);
for (auto const& link : route)
get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);
- if (not back_route.empty()) { // cfg_crosstraffic was activated
- XBT_DEBUG("Crosstraffic active adding backward flow using 5%%");
+ if (cfg_crosstraffic) {
+ XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth");
for (auto const& link : back_route)
get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);