X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/957da2691fc483ae05228fc6ef815af5944452af..cdf6a962eb4e88efbed3df9c41343adabcf09e6c:/src/surf/network_cm02.cpp?ds=sidebyside diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index c99333ff4e..9945dbde76 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -104,7 +104,7 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) { while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { - NetworkCm02Action* action = static_cast(get_action_heap().pop()); + auto* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Something happened to action %p", action); // if I am wearing a latency hat @@ -184,10 +184,11 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); }); } - NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); + auto* action = new NetworkCm02Action(this, size, failed); action->sharing_penalty_ = latency; action->latency_ = latency; action->rate_ = rate; + if (get_update_algorithm() == Model::UpdateAlgo::LAZY) { action->set_last_update(); } @@ -235,13 +236,49 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz : action->rate_); } - for (auto const& link : route) - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); + for (auto const& link : route) { + // Handle WIFI links + if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + NetworkWifiLink* wifi_link = static_cast(link); + + double src_rate = wifi_link->get_host_rate(src); + double dst_rate = wifi_link->get_host_rate(dst); + xbt_assert( + !(src_rate == -1 && dst_rate == -1), + "Some Stations are not associated to any Access Point. Make sure to call set_host_rate on all Stations."); + if (src_rate != -1) + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate); + else + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / dst_rate); + + } else { + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); + } + } 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); + bool wifi_dst_assigned = false; // Used by wifi crosstraffic + for (auto const& link : back_route) { + if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { + NetworkWifiLink* wifi_link = static_cast(link); + /** + * For wifi links we should add 0.05/rate. + * However since we are using the "back_route" we should encounter in + * the first place the dst wifi link. + */ + if (!wifi_dst_assigned && (wifi_link->get_host_rate(dst) != -1)) { + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), + .05 / wifi_link->get_host_rate(dst)); + wifi_dst_assigned = true; + } else { + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), + .05 / wifi_link->get_host_rate(src)); + } + } else { + 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()) @@ -315,7 +352,7 @@ void NetworkCm02Link::set_bandwidth(double value) const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { - NetworkCm02Action* action = static_cast(var->get_id()); + auto* action = static_cast(var->get_id()); action->sharing_penalty_ += delta; if (not action->is_suspended()) get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_); @@ -334,7 +371,7 @@ void NetworkCm02Link::set_latency(double value) latency_.peak = value; while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { - NetworkCm02Action* action = static_cast(var->get_id()); + auto* action = static_cast(var->get_id()); action->lat_current_ += delta; action->sharing_penalty_ += delta; if (action->rate_ < 0) @@ -357,16 +394,41 @@ void NetworkCm02Link::set_latency(double value) NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector bandwidths, s4u::Link::SharingPolicy policy, lmm::System* system) - : NetworkCm02Link(model, name, 0, 0, policy, system) + : NetworkCm02Link( + model, name, 1 / sg_bandwidth_factor, 0, policy, + system) // Since link use bw*sg_bandwidth_factor we should divise in order to as 1 as bound in the lmm system { - for (auto bandwith : bandwidths) { - bandwidths_.push_back({bandwith, 1.0, nullptr}); + for (auto bandwidth : bandwidths) { + bandwidths_.push_back({bandwidth, 1.0, nullptr}); } } -void NetworkWifiLink::set_host_rate(sg_host_t host, int rate_level) +void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level) +{ + auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level)); + if (insert_done.second == false) + insert_done.first->second = rate_level; +} + +double NetworkWifiLink::get_host_rate(sg_host_t host) { - host_rates_.insert(std::make_pair(host->get_name(), rate_level)); + std::map::iterator host_rates_it; + host_rates_it = host_rates_.find(host->get_name()); + + if (host_rates_it == host_rates_.end()) + return -1; + + int rate_id = host_rates_it->second; + xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host \"%s\" has an invalid rate \"%d\"", + host->get_name().c_str(), rate_id); + + Metric rate = bandwidths_[rate_id]; + return rate.peak * rate.scale; +} + +s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() +{ + return s4u::Link::SharingPolicy::WIFI; } /********** @@ -400,6 +462,6 @@ void NetworkCm02Action::update_remains_lazy(double now) set_last_value(get_variable()->get_value()); } -} -} +} // namespace resource +} // namespace kernel } // namespace simgrid