X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e71a2a302d28430dc1bfee906f842f5f3d0fa3ce..fcb729916269f63a4c9d031d5be35aff3774e769:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 4e45f4d4d4..9cafb25f8b 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -39,9 +39,8 @@ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or fro /* } */ void surf_network_model_init_LegrandVelho() { - auto net_model = std::make_shared(); - net_model->set_name("Network_LegrandVelho"); - simgrid::kernel::EngineImpl::get_instance()->add_model(net_model, {}); + auto net_model = std::make_shared("Network_LegrandVelho"); + simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); simgrid::config::set_default("network/latency-factor", 13.01); @@ -66,9 +65,8 @@ void surf_network_model_init_CM02() simgrid::config::set_default("network/bandwidth-factor", 1.0); simgrid::config::set_default("network/weight-S", 0.0); - auto net_model = std::make_shared(); - net_model->set_name("Network_CM02"); - simgrid::kernel::EngineImpl::get_instance()->add_model(net_model, {}); + auto net_model = std::make_shared("Network_CM02"); + simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); } @@ -76,39 +74,70 @@ namespace simgrid { namespace kernel { namespace resource { -NetworkCm02Model::NetworkCm02Model() +NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name) { - if (config::get_value("network/optim") == "Lazy") - set_update_algorithm(Model::UpdateAlgo::LAZY); - std::string optim = config::get_value("network/optim"); bool select = config::get_value("network/maxmin-selective-update"); if (optim == "Lazy") { + set_update_algorithm(Model::UpdateAlgo::LAZY); xbt_assert(select || config::is_default("network/maxmin-selective-update"), "You cannot disable network selective update when using the lazy update mechanism"); select = true; } set_maxmin_system(new lmm::System(select)); - loopback_ = NetworkCm02Model::create_link("__loopback__", - std::vector{config::get_value("network/loopback-bw")}, - s4u::Link::SharingPolicy::FATPIPE) - ->set_latency(config::get_value("network/loopback-lat")); + loopback_ = create_link("__loopback__", {config::get_value("network/loopback-bw")}); + loopback_->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE, {}); + loopback_->set_latency(config::get_value("network/loopback-lat")); loopback_->seal(); } -LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector& bandwidths, - s4u::Link::SharingPolicy policy) +void NetworkCm02Model::check_lat_factor_cb() { - LinkImpl* link; - if (policy == s4u::Link::SharingPolicy::WIFI) { - link = new NetworkWifiLink(name, bandwidths, get_maxmin_system()); - } else { - xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth."); - link = new NetworkCm02Link(name, bandwidths[0], policy, get_maxmin_system()); + if (not simgrid::config::is_default("network/latency-factor")) { + throw std::invalid_argument( + "NetworkModelIntf: Cannot mix network/latency-factor and callback configuration. Choose only one of them."); + } +} + +void NetworkCm02Model::check_bw_factor_cb() +{ + if (not simgrid::config::is_default("network/bandwidth-factor")) { + throw std::invalid_argument( + "NetworkModelIntf: Cannot mix network/bandwidth-factor and callback configuration. Choose only one of them."); } +} + +void NetworkCm02Model::set_lat_factor_cb(const std::function& cb) +{ + if (not cb) + throw std::invalid_argument("NetworkModelIntf: Invalid callback"); + check_lat_factor_cb(); + + lat_factor_cb_ = cb; +} + +void NetworkCm02Model::set_bw_factor_cb(const std::function& cb) +{ + if (not cb) + throw std::invalid_argument("NetworkModelIntf: Invalid callback"); + check_bw_factor_cb(); + + bw_factor_cb_ = cb; +} + +LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector& bandwidths) +{ + xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth."); + auto link = new NetworkCm02Link(name, bandwidths[0], get_maxmin_system()); + link->set_model(this); + return link; +} +LinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) +{ + auto link = new NetworkWifiLink(name, bandwidths, get_maxmin_system()); link->set_model(this); return link; } @@ -162,7 +191,7 @@ void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) */ action.update_remains(action.get_remains()); } - action.update_remains(action.get_variable()->get_value() * delta); + action.update_remains(action.get_rate() * delta); if (action.get_max_duration() != NO_MAX_DURATION) action.update_max_duration(delta); @@ -174,30 +203,59 @@ void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) } } -Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +void NetworkCm02Model::comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst, + const NetworkCm02Action* action, + const std::vector& route, + const std::vector& back_route) const { - double latency = 0.0; - std::vector back_route; - std::vector route; - - XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); + /* expand route links constraints for route and back_route */ + const NetworkWifiLink* src_wifi_link = nullptr; + const NetworkWifiLink* dst_wifi_link = nullptr; + if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + src_wifi_link = static_cast(route.front()); + } + if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + dst_wifi_link = static_cast(route.back()); + } - src->route_to(dst, route, &latency); - xbt_assert(not route.empty() || latency > 0, - "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()); + /* WI-FI links needs special treatment, do it here */ + if (src_wifi_link != nullptr) + get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), + 1.0 / src_wifi_link->get_host_rate(src)); + if (dst_wifi_link != nullptr) + get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), + 1.0 / dst_wifi_link->get_host_rate(dst)); - bool failed = std::any_of(route.begin(), route.end(), [](const LinkImpl* link) { return not link->is_on(); }); + for (auto const* link : route) { + if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); + } if (cfg_crosstraffic) { - dst->route_to(src, back_route, nullptr); - if (not failed) - failed = - std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); + XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); + if (dst_wifi_link != nullptr) + get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), + .05 / dst_wifi_link->get_host_rate(dst)); + if (src_wifi_link != nullptr) + get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), + .05 / src_wifi_link->get_host_rate(src)); + + for (auto const* link : back_route) { + if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05); + } + // Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency + // (You would also have to change simgrid::kernel::lmm::Element::get_concurrency()) + // action->getVariable()->set_concurrency_share(2) } +} +NetworkCm02Action* NetworkCm02Model::comm_action_create(s4u::Host* src, s4u::Host* dst, double size, + const std::vector& route, bool failed) +{ NetworkWifiLink* src_wifi_link = nullptr; NetworkWifiLink* dst_wifi_link = nullptr; + /* many checks related to Wi-Fi links */ if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { src_wifi_link = static_cast(route.front()); xbt_assert(src_wifi_link->get_host_rate(src) != -1, @@ -220,35 +278,103 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz "Did you declare an access_point in your WIFI zones?", route[i]->get_cname(), src->get_cname(), dst->get_cname(), i + 1, route.size()); + for (auto const* link : route) { + if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + xbt_assert(link == src_wifi_link || link == dst_wifi_link, + "Wifi links can only occur at the beginning of the route (meaning that it's attached to the src) or " + "at its end (meaning that it's attached to the dst"); + } + } + + /* create action and do some initializations */ NetworkCm02Action* action; if (src_wifi_link == nullptr && dst_wifi_link == nullptr) action = new NetworkCm02Action(this, *src, *dst, size, failed); else action = new NetworkWifiAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link); - action->sharing_penalty_ = latency; - action->latency_ = latency; - action->set_user_bound(rate); if (is_update_lazy()) { action->set_last_update(); } - if (sg_weight_S_parameter > 0) { - action->sharing_penalty_ = - std::accumulate(route.begin(), route.end(), action->sharing_penalty_, [](double total, LinkImpl* const& link) { - return total + sg_weight_S_parameter / link->get_bandwidth(); - }); + return action; +} + +bool NetworkCm02Model::comm_get_route_info(const s4u::Host* src, const s4u::Host* dst, double& latency, + std::vector& route, std::vector& back_route, + std::unordered_set& netzones) const +{ + kernel::routing::NetZoneImpl::get_global_route_with_netzones(src->get_netpoint(), dst->get_netpoint(), route, + &latency, netzones); + + xbt_assert(not route.empty() || latency > 0, + "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()); + + bool failed = std::any_of(route.begin(), route.end(), [](const LinkImpl* link) { return not link->is_on(); }); + + if (cfg_crosstraffic) { + dst->route_to(src, back_route, nullptr); + if (not failed) + failed = + std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); } + return failed; +} - double bandwidth_bound = route.empty() ? -1.0 : get_bandwidth_factor(size) * route.front()->get_bandwidth(); +void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size, + NetworkCm02Action* action, const std::vector& route, + const std::unordered_set& netzones, + double rate) +{ + std::vector s4u_route; + std::unordered_set s4u_netzones; + + /* transform data to user structures if necessary */ + if (lat_factor_cb_ || bw_factor_cb_) { + std::for_each(route.begin(), route.end(), [&s4u_route](LinkImpl* l) { s4u_route.push_back(l->get_iface()); }); + std::for_each(netzones.begin(), netzones.end(), + [&s4u_netzones](kernel::routing::NetZoneImpl* n) { s4u_netzones.insert(n->get_iface()); }); + } + double bw_factor; + if (bw_factor_cb_) { + bw_factor = bw_factor_cb_(size, src, dst, s4u_route, s4u_netzones); + } else { + bw_factor = get_bandwidth_factor(size); + } + xbt_assert(bw_factor != 0, "Invalid param for comm %s -> %s. Bandwidth factor cannot be 0", src->get_cname(), + dst->get_cname()); + action->set_rate_factor(bw_factor); + + /* get mininum bandwidth among links in the route and multiply by correct factor + * ignore wi-fi links, they're not considered for bw_factors */ + double bandwidth_bound = -1.0; + for (const auto* l : route) { + if (l->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) + continue; + if (bandwidth_bound == -1.0 || l->get_bandwidth() < bandwidth_bound) + bandwidth_bound = l->get_bandwidth(); + } - for (auto const& link : route) - bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth()); + /* increase rate given by user considering the factor, since the actual rate will be + * modified by it */ + rate = rate / bw_factor; + /* the bandwidth is determined by the minimum between flow and user's defined rate */ + if (rate >= 0 && rate < bandwidth_bound) + bandwidth_bound = rate; + action->set_user_bound(bandwidth_bound); action->lat_current_ = action->latency_; - action->latency_ *= get_latency_factor(size); - action->set_user_bound(get_bandwidth_constraint(action->get_user_bound(), bandwidth_bound, size)); + if (lat_factor_cb_) { + action->latency_ *= lat_factor_cb_(size, src, dst, s4u_route, s4u_netzones); + } else { + action->latency_ *= get_latency_factor(size); + } +} +void NetworkCm02Model::comm_action_set_variable(NetworkCm02Action* action, const std::vector& route, + const std::vector& back_route) +{ size_t constraints_per_variable = route.size(); constraints_per_variable += back_route.size(); @@ -266,6 +392,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz } else action->set_variable(get_maxmin_system()->variable_new(action, 1.0, -1.0, constraints_per_variable)); + /* after setting the variable, update the bounds depending on user configuration */ if (action->get_user_bound() < 0) { get_maxmin_system()->update_variable_bound( action->get_variable(), (action->lat_current_ > 0) ? cfg_tcp_gamma / (2.0 * action->lat_current_) : -1.0); @@ -275,40 +402,38 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz ? std::min(action->get_user_bound(), cfg_tcp_gamma / (2.0 * action->lat_current_)) : action->get_user_bound()); } +} - if (src_wifi_link != nullptr) - get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), - 1.0 / src_wifi_link->get_host_rate(src)); - if (dst_wifi_link != nullptr) - get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), - 1.0 / dst_wifi_link->get_host_rate(dst)); +Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +{ + double latency = 0.0; + std::vector back_route; + std::vector route; + std::unordered_set netzones; - for (auto const* link : route) { - // WIFI links are handled manually just above, so skip them now - if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { - xbt_assert(link == src_wifi_link || link == dst_wifi_link, - "Wifi links can only occur at the beginning of the route (meaning that it's attached to the src) or " - "at its end (meaning that it's attached to the dst"); - } else { - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); - } - } + XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); - if (cfg_crosstraffic) { - XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); - if (dst_wifi_link != nullptr) - get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(), - .05 / dst_wifi_link->get_host_rate(dst)); - if (src_wifi_link != nullptr) - get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(), - .05 / src_wifi_link->get_host_rate(src)); - for (auto const* link : back_route) - if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI) - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05); - // Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency - // (You would also have to change simgrid::kernel::lmm::Element::get_concurrency()) - // action->getVariable()->set_concurrency_share(2) + bool failed = comm_get_route_info(src, dst, latency, route, back_route, netzones); + + NetworkCm02Action* action = comm_action_create(src, dst, size, route, failed); + action->sharing_penalty_ = latency; + action->latency_ = latency; + + if (sg_weight_S_parameter > 0) { + action->sharing_penalty_ = + std::accumulate(route.begin(), route.end(), action->sharing_penalty_, [](double total, LinkImpl* const& link) { + return total + sg_weight_S_parameter / link->get_bandwidth(); + }); } + + /* setting bandwidth and latency bounds considering route and configured bw/lat factors */ + comm_action_set_bounds(src, dst, size, action, route, netzones, rate); + + /* creating the maxmin variable associated to this action */ + comm_action_set_variable(action, route, back_route); + + /* expand maxmin system to consider this communication in bw constraint for each link in route and back_route */ + comm_action_expand_constraints(src, dst, action, route, back_route); XBT_OUT(); simgrid::s4u::Link::on_communicate(*action); @@ -318,16 +443,12 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz /************ * Resource * ************/ -NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy, - kernel::lmm::System* system) +NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, kernel::lmm::System* system) : LinkImpl(name) { bandwidth_.scale = 1.0; bandwidth_.peak = bandwidth; - this->set_constraint(system->constraint_new(this, sg_bandwidth_factor * bandwidth)); - - if (policy == s4u::Link::SharingPolicy::FATPIPE) - get_constraint()->unshare(); + this->set_constraint(system->constraint_new(this, bandwidth)); } void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value) @@ -359,8 +480,7 @@ void NetworkCm02Link::set_bandwidth(double value) { bandwidth_.peak = value; - get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), - sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), (bandwidth_.peak * bandwidth_.scale)); LinkImpl::on_bandwidth_change(); @@ -369,7 +489,7 @@ void NetworkCm02Link::set_bandwidth(double value) const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; - int numelem = 0; + size_t numelem = 0; while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) { auto* action = static_cast(var->get_id()); action->sharing_penalty_ += delta; @@ -379,14 +499,14 @@ void NetworkCm02Link::set_bandwidth(double value) } } -LinkImpl* NetworkCm02Link::set_latency(double value) +void NetworkCm02Link::set_latency(double value) { latency_check(value); - double delta = value - latency_.peak; + double delta = value - latency_.peak; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; - int numelem = 0; + size_t numelem = 0; latency_.scale = 1.0; latency_.peak = value; @@ -412,7 +532,6 @@ LinkImpl* NetworkCm02Link::set_latency(double value) if (not action->is_suspended()) get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_); } - return this; } /********** @@ -443,7 +562,7 @@ void NetworkCm02Action::update_remains_lazy(double now) } set_last_update(); - set_last_value(get_variable()->get_value()); + set_last_value(get_rate()); } } // namespace resource