* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/surf/network_cm02.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/profile/Event.hpp"
#include "src/surf/network_wifi.hpp"
#include "src/surf/surf_interface.hpp"
/* } */
void surf_network_model_init_LegrandVelho()
{
- xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
-
- surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
+ auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("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<double>("network/latency-factor", 13.01);
simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
/* } */
void surf_network_model_init_CM02()
{
- xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
-
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();
+ auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("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);
}
namespace simgrid {
namespace kernel {
namespace resource {
-NetworkCm02Model::NetworkCm02Model()
- : NetworkModel(config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
- : Model::UpdateAlgo::LAZY)
+NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name)
{
- all_existing_models.push_back(this);
- models_by_type[simgrid::kernel::resource::Model::Type::NETWORK].push_back(this);
-
std::string optim = config::get_value<std::string>("network/optim");
bool select = config::get_value<bool>("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<double>{config::get_value<double>("network/loopback-bw")},
- s4u::Link::SharingPolicy::FATPIPE)
+ loopback_ = create_link("__loopback__", std::vector<double>{config::get_value<double>("network/loopback-bw")})
+ ->set_sharing_policy(s4u::Link::SharingPolicy::FATPIPE)
->set_latency(config::get_value<double>("network/loopback-lat"));
loopback_->seal();
}
-LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths,
- s4u::Link::SharingPolicy policy)
+void NetworkCm02Model::check_lat_factor_cb()
+{
+ 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<NetworkFactorCb>& 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<NetworkFactorCb>& cb)
{
- if (policy == s4u::Link::SharingPolicy::WIFI)
- return (new NetworkWifiLink(name, bandwidths, get_maxmin_system()))->set_model(this);
+ 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<double>& bandwidths)
+{
xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth.");
- return (new NetworkCm02Link(name, bandwidths[0], policy, get_maxmin_system()))->set_model(this);
+ return (new NetworkCm02Link(name, bandwidths[0], get_maxmin_system()))->set_model(this);
+}
+
+LinkImpl* NetworkCm02Model::create_wifi_link(const std::string& name, const std::vector<double>& bandwidths)
+{
+ return (new NetworkWifiLink(name, bandwidths, get_maxmin_system()))->set_model(this);
}
void NetworkCm02Model::update_actions_state_lazy(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,
+ NetworkCm02Action* action, const std::vector<LinkImpl*>& route,
+ const std::vector<LinkImpl*>& back_route)
{
- double latency = 0.0;
- std::vector<LinkImpl*> back_route;
- std::vector<LinkImpl*> route;
-
- XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
+ /* expand route links constraints for route and back_route */
+ NetworkWifiLink* src_wifi_link = nullptr;
+ NetworkWifiLink* dst_wifi_link = nullptr;
+ if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ src_wifi_link = static_cast<NetworkWifiLink*>(route.front());
+ }
+ if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ dst_wifi_link = static_cast<NetworkWifiLink*>(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<LinkImpl*>& 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<NetworkWifiLink*>(route.front());
xbt_assert(src_wifi_link->get_host_rate(src) != -1,
"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<LinkImpl*>& route, std::vector<LinkImpl*>& back_route,
+ std::unordered_set<kernel::routing::NetZoneImpl*>& 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<LinkImpl*>& route,
+ const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones)
+{
+ std::vector<s4u::Link*> s4u_route;
+ std::unordered_set<s4u::NetZone*> 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);
+ }
+ /* 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();
+ }
+ bandwidth_bound *= bw_factor;
- for (auto const& link : route)
- bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth());
+ action->set_user_bound(get_bandwidth_constraint(action->get_user_bound(), bandwidth_bound, size));
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<LinkImpl*>& route,
+ const std::vector<LinkImpl*>& back_route)
+{
size_t constraints_per_variable = route.size();
constraints_per_variable += back_route.size();
} 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);
? 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<LinkImpl*> back_route;
+ std::vector<LinkImpl*> route;
+ std::unordered_set<kernel::routing::NetZoneImpl*> 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;
+ action->set_user_bound(rate);
+
+ 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);
+
+ /* 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);
/************
* 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();
}
void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value)
if (sg_weight_S_parameter > 0) {
double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale);
- const kernel::lmm::Variable* var;
const kernel::lmm::Element* elem = nullptr;
const kernel::lmm::Element* nextelem = nullptr;
int numelem = 0;
- while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
+ while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) {
auto* action = static_cast<NetworkCm02Action*>(var->get_id());
action->sharing_penalty_ += delta;
if (not action->is_suspended())
{
latency_check(value);
- double delta = value - latency_.peak;
- const kernel::lmm::Variable* var;
+ double delta = value - latency_.peak;
const kernel::lmm::Element* elem = nullptr;
const kernel::lmm::Element* nextelem = nullptr;
int numelem = 0;
latency_.scale = 1.0;
latency_.peak = value;
- while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
+ while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) {
auto* action = static_cast<NetworkCm02Action*>(var->get_id());
action->lat_current_ += delta;
action->sharing_penalty_ += delta;