namespace kernel {
namespace resource {
-NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
+NetworkCm02Model::NetworkCm02Model()
: NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
: Model::UpdateAlgo::LAZY)
{
select = true;
}
- set_maxmin_system(make_new_lmm_system(select));
+ set_maxmin_system(new lmm::System(select));
loopback_ = NetworkCm02Model::create_link("__loopback__",
std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
simgrid::config::get_value<double>("network/loopback-lat"),
void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta)
{
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
- NetworkCm02Action& action = static_cast<NetworkCm02Action&>(*it);
+ auto& action = static_cast<NetworkCm02Action&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
XBT_DEBUG("Something happened to action %p", &action);
double deltap = delta;
NetworkWifiLink* src_wifi_link = nullptr;
NetworkWifiLink* dst_wifi_link = nullptr;
- if (not route.empty() && route.at(0)->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
- src_wifi_link = static_cast<NetworkWifiLink*>(route.at(0));
+ 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,
"The route from %s to %s begins with the WIFI link %s, but the host %s does not seem attached to that "
"WIFI link. Did you call link->set_host_rate()?",
src->get_cname(), dst->get_cname(), src_wifi_link->get_cname(), src->get_cname());
}
- if (route.size() > 1 && route.at(route.size() - 1)->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
- dst_wifi_link = static_cast<NetworkWifiLink*>(route.at(route.size() - 1));
+ if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+ dst_wifi_link = static_cast<NetworkWifiLink*>(route.back());
xbt_assert(dst_wifi_link->get_host_rate(dst) != -1,
"The route from %s to %s ends with the WIFI link %s, but the host %s does not seem attached to that "
"WIFI link. Did you call link->set_host_rate()?",
src->get_cname(), dst->get_cname(), dst_wifi_link->get_cname(), dst->get_cname());
}
+ if (route.size() > 2)
+ for (unsigned i = 1; i < route.size() - 1; i++)
+ xbt_assert(route[i]->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI,
+ "Link '%s' is a WIFI link. It can only be at the beginning or the end of the route from '%s' to '%s', "
+ "not in between (it is at position %u out of %zu). "
+ "Did you declare an access_point in your WIFI zones?",
+ route[i]->get_cname(), src->get_cname(), dst->get_cname(), i + 1, route.size());
NetworkCm02Action* action;
if (src_wifi_link == nullptr && 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));
- for (auto const& link : route) {
+ 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,
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)
+ 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