X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1aaf3e3fc120f9434c692f1c49d03a00b24e55a1..8372ae97612f27b84e8d75aeeed9de0ba6d2ba6a:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 01a14eaa91..aa9df6d85e 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -7,7 +7,7 @@ #include "network_cm02.hpp" #include "simgrid/s4u/Host.hpp" -#include "simgrid/sg_config.h" +#include "simgrid/sg_config.hpp" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/kernel/lmm/maxmin.hpp" @@ -87,14 +87,14 @@ void surf_network_model_init_Reno() if (surf_network_model) return; - set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp, - simgrid::kernel::lmm::func_reno_fpi); + using namespace simgrid::kernel; + lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); xbt_cfg_setdefault_double("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } @@ -104,14 +104,14 @@ void surf_network_model_init_Reno2() if (surf_network_model) return; - set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp, - simgrid::kernel::lmm::func_reno2_fpi); + using namespace simgrid::kernel; + lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); xbt_cfg_setdefault_double("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } @@ -120,56 +120,44 @@ void surf_network_model_init_Vegas() if (surf_network_model) return; - set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp, - simgrid::kernel::lmm::func_vegas_fpi); + using namespace simgrid::kernel; + lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); xbt_cfg_setdefault_double("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } namespace simgrid { namespace surf { -NetworkCm02Model::NetworkCm02Model() - :NetworkModel() +NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) + : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? kernel::resource::Model::UpdateAlgo::Full + : kernel::resource::Model::UpdateAlgo::Lazy) { std::string optim = xbt_cfg_get_string("network/optim"); bool select = xbt_cfg_get_boolean("network/maxmin-selective-update"); - if (optim == "Full") { - setUpdateMechanism(UM_FULL); - } else if (optim == "Lazy") { + if (optim == "Lazy") { + xbt_assert(select || xbt_cfg_is_default_value("network/maxmin-selective-update"), + "You cannot disable network selective update when using the lazy update mechanism"); select = true; - setUpdateMechanism(UM_LAZY); - xbt_assert(select || (xbt_cfg_is_default_value("network/maxmin-selective-update")), - "You cannot disable selective update when using the lazy update mechanism"); - } else { - xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim.c_str()); } - maxmin_system_ = new simgrid::kernel::lmm::System(select); + set_maxmin_system(make_new_lmm_system(select)); loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); - - if (getUpdateMechanism() == UM_LAZY) - maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet(); -} - -NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(kernel::lmm::System* self)) : NetworkCm02Model() -{ - maxmin_system_->solve_fun = specificSolveFun; } LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) { - return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxmin_system_); + return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system()); } -void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) +void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) { while (not actionHeapIsEmpty() && double_equals(actionHeapTopDate(), now, sg_surf_precision)) { @@ -190,7 +178,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) // if I am wearing a latency hat if (action->get_type() == kernel::resource::Action::Type::LATENCY) { XBT_DEBUG("Latency paid for action %p. Activating", action); - maxmin_system_->update_variable_weight(action->get_variable(), action->weight_); + get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); action->heapRemove(); action->set_last_update(); @@ -206,10 +194,9 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) } } - -void NetworkCm02Model::updateActionsStateFull(double now, double delta) +void NetworkCm02Model::update_actions_state_full(double now, double delta) { - for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { NetworkCm02Action& action = static_cast(*it); ++it; // increment iterator here since the following calls to action.finish() may invalidate it XBT_DEBUG("Something happened to action %p", &action); @@ -223,7 +210,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) action.latency_ = 0.0; } if (action.latency_ <= 0.0 && not action.is_suspended()) - maxmin_system_->update_variable_weight(action.get_variable(), action.weight_); + get_maxmin_system()->update_variable_weight(action.get_variable(), action.weight_); } if (TRACE_is_enabled()) { int n = action.get_variable()->get_number_of_constraint(); @@ -283,7 +270,7 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos action->weight_ = latency; action->latency_ = latency; action->rate_ = rate; - if (getUpdateMechanism() == UM_LAZY) { + if (getUpdateMechanism() == kernel::resource::Model::UpdateAlgo::Lazy) { action->set_last_update(); } @@ -305,8 +292,8 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos constraints_per_variable += back_route.size(); if (action->latency_ > 0) { - action->set_variable(maxmin_system_->variable_new(action, 0.0, -1.0, constraints_per_variable)); - if (getUpdateMechanism() == UM_LAZY) { + action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable)); + if (getUpdateMechanism() == kernel::resource::Model::UpdateAlgo::Lazy) { // add to the heap the event when the latency is payed XBT_DEBUG("Added action (%p) one latency event at date %f", action, action->latency_ + action->get_last_update()); action->heapInsert(action->latency_ + action->get_last_update(), route.empty() @@ -314,25 +301,25 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos : kernel::resource::Action::Type::LATENCY); } } else - action->set_variable(maxmin_system_->variable_new(action, 1.0, -1.0, constraints_per_variable)); + action->set_variable(get_maxmin_system()->variable_new(action, 1.0, -1.0, constraints_per_variable)); if (action->rate_ < 0) { - maxmin_system_->update_variable_bound( + get_maxmin_system()->update_variable_bound( action->get_variable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); } else { - maxmin_system_->update_variable_bound(action->get_variable(), - (action->latCurrent_ > 0) - ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) - : action->rate_); + get_maxmin_system()->update_variable_bound(action->get_variable(), + (action->latCurrent_ > 0) + ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) + : action->rate_); } for (auto const& link : route) - maxmin_system_->expand(link->constraint(), action->get_variable(), 1.0); + get_maxmin_system()->expand(link->constraint(), action->get_variable(), 1.0); if (not back_route.empty()) { // sg_network_crosstraffic was activated XBT_DEBUG("Crosstraffic active adding backward flow using 5%%"); for (auto const& link : back_route) - maxmin_system_->expand(link->constraint(), action->get_variable(), .05); + get_maxmin_system()->expand(link->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()) @@ -405,8 +392,8 @@ void NetworkCm02Link::setBandwidth(double value) { bandwidth_.peak = value; - model()->getMaxminSystem()->update_constraint_bound(constraint(), - sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + model()->get_maxmin_system()->update_constraint_bound(constraint(), + sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); TRACE_surf_link_set_bandwidth(surf_get_clock(), getCname(), sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); if (sg_weight_S_parameter > 0) { @@ -420,7 +407,7 @@ void NetworkCm02Link::setBandwidth(double value) NetworkCm02Action* action = static_cast(var->get_id()); action->weight_ += delta; if (not action->is_suspended()) - model()->getMaxminSystem()->update_variable_weight(action->get_variable(), action->weight_); + model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); } } } @@ -440,10 +427,10 @@ void NetworkCm02Link::setLatency(double value) action->latCurrent_ += delta; action->weight_ += delta; if (action->rate_ < 0) - model()->getMaxminSystem()->update_variable_bound(action->get_variable(), - sg_tcp_gamma / (2.0 * action->latCurrent_)); + model()->get_maxmin_system()->update_variable_bound(action->get_variable(), + sg_tcp_gamma / (2.0 * action->latCurrent_)); else { - model()->getMaxminSystem()->update_variable_bound( + model()->get_maxmin_system()->update_variable_bound( action->get_variable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) { @@ -453,7 +440,7 @@ void NetworkCm02Link::setLatency(double value) } } if (not action->is_suspended()) - model()->getMaxminSystem()->update_variable_weight(action->get_variable(), action->weight_); + model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); } }