X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f2eb14fe202d65be982586cc8c4b6169b39779c..bde09a7b53c62986d6f22b10de50dec039b4f96a:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 48fe8ed242..d9e3a7e44e 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -3,10 +3,11 @@ /* 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 "network_cm02.hpp" +#include "src/surf/network_cm02.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.hpp" #include "src/kernel/resource/profile/Event.hpp" +#include "src/surf/network_wifi.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" @@ -93,18 +94,17 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector& bandwidths, double latency, s4u::Link::SharingPolicy policy) { - if (policy == s4u::Link::SharingPolicy::WIFI) { - return (new NetworkWifiLink(this, name, bandwidths, policy, get_maxmin_system())); - } - xbt_assert(bandwidths.size() == 1, "Non WIFI links must use only 1 bandwidth."); + if (policy == s4u::Link::SharingPolicy::WIFI) + return new NetworkWifiLink(this, name, bandwidths, get_maxmin_system()); + + xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth."); return new NetworkCm02Link(this, name, bandwidths[0], latency, policy, get_maxmin_system()); } 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,7 +184,7 @@ 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; @@ -239,25 +239,17 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz for (auto const& link : route) { // Handle WIFI links if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { - xbt_assert(!cfg_crosstraffic, - "Cross-traffic is not yet supported when using WIFI. Please use --cfg=network/crosstraffic:0"); - NetworkWifiLink* wifi_link = (NetworkWifiLink*)link; + NetworkWifiLink* wifi_link = static_cast(link); - double src_rate = wifi_link->get_host_rate(src); - double dst_rate = wifi_link->get_host_rate(dst); + double wifi_rate = wifi_link->get_host_rate(src); + if (wifi_rate == -1.0) + wifi_rate = wifi_link->get_host_rate(dst); + xbt_assert(wifi_rate != -1.0, + "None of the source (%s) or destination (%s) is connected to the Access Point '%s'. " + "Please use set_host_rate() on all stations.", + src->get_cname(), dst->get_cname(), link->get_cname()); + get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / wifi_rate); - // TODO: What do to when src and dst are on the same AP ? (for the moment we use src rate) - if (src_rate != -1 && dst_rate != -1) { - get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate); - } else { - 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); } @@ -265,8 +257,27 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz 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()) @@ -294,7 +305,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam if (policy == s4u::Link::SharingPolicy::FATPIPE) get_constraint()->unshare(); - simgrid::s4u::Link::on_creation(this->piface_); + simgrid::s4u::Link::on_creation(*get_iface()); } void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value) @@ -311,9 +322,8 @@ void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double valu } else if (triggered == state_event_) { if (value > 0) turn_on(); - else { + else turn_off(); - } tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); @@ -335,12 +345,12 @@ void NetworkCm02Link::set_bandwidth(double value) if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); - kernel::lmm::Variable* var; + 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))) { - 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_); @@ -351,7 +361,7 @@ void NetworkCm02Link::set_bandwidth(double value) void NetworkCm02Link::set_latency(double value) { double delta = value - latency_.peak; - kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Variable* var; const kernel::lmm::Element* elem = nullptr; const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; @@ -359,7 +369,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) @@ -380,46 +390,6 @@ 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, 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 bandwidth : bandwidths) { - bandwidths_.push_back({bandwidth, 1.0, nullptr}); - } -} - -void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level) -{ - std::pair::iterator, bool> 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) -{ - 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; -} - /********** * Action * **********/ @@ -451,6 +421,6 @@ void NetworkCm02Action::update_remains_lazy(double now) set_last_value(get_variable()->get_value()); } -} -} +} // namespace resource +} // namespace kernel } // namespace simgrid