X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f50aa3d0ce380b0f9bcd5a217c5015e6bd3db18..8de466d0f03f18b22c6c36170b509d48a39fcd52:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index e0c2bd9b7e..3970dcc8d5 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" @@ -17,7 +17,6 @@ double sg_latency_factor = 1.0; /* default value; can be set by model or from co double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ -double sg_tcp_gamma = 0.0; int sg_network_crosstraffic = 0; /************************************************************************/ @@ -87,14 +86,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 +103,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,60 +119,48 @@ 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::update_actions_state_lazy(double now, double /*delta*/) { - while (not actionHeapIsEmpty() && double_equals(actionHeapTopDate(), now, sg_surf_precision)) { + while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { - NetworkCm02Action* action = static_cast(actionHeapPop()); + NetworkCm02Action* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Something happened to action %p", action); if (TRACE_is_enabled()) { int n = action->get_variable()->get_number_of_constraint(); @@ -182,26 +169,26 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i); NetworkCm02Link* link = static_cast(constraint->get_id()); double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i); - TRACE_surf_link_set_utilization(link->getCname(), action->get_category(), value, action->get_last_update(), + TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), value, action->get_last_update(), now - action->get_last_update()); } } // if I am wearing a latency hat - if (action->get_type() == kernel::resource::Action::Type::LATENCY) { + if (action->get_type() == kernel::resource::ActionHeap::Type::latency) { XBT_DEBUG("Latency paid for action %p. Activating", action); - maxmin_system_->update_variable_weight(action->get_variable(), action->weight_); - action->heapRemove(); + get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); + get_action_heap().remove(action); action->set_last_update(); // if I am wearing a max_duration or normal hat - } else if (action->get_type() == kernel::resource::Action::Type::MAX_DURATION || - action->get_type() == kernel::resource::Action::Type::NORMAL) { + } else if (action->get_type() == kernel::resource::ActionHeap::Type::max_duration || + action->get_type() == kernel::resource::ActionHeap::Type::normal) { // no need to communicate anymore // assume that flows that reached max_duration have remaining of 0 XBT_DEBUG("Action %p finished", action); action->finish(kernel::resource::Action::State::done); - action->heapRemove(); + get_action_heap().remove(action); } } } @@ -222,7 +209,7 @@ void NetworkCm02Model::update_actions_state_full(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(); @@ -230,7 +217,7 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) kernel::lmm::Constraint* constraint = action.get_variable()->get_constraint(i); NetworkCm02Link* link = static_cast(constraint->get_id()); TRACE_surf_link_set_utilization( - link->getCname(), action.get_category(), + link->get_cname(), action.get_category(), (action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i)), action.get_last_update(), now - action.get_last_update()); } @@ -260,21 +247,21 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos std::vector back_route; std::vector route; - XBT_IN("(%s,%s,%g,%g)", src->getCname(), dst->getCname(), size, rate); + XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate); src->routeTo(dst, route, &latency); xbt_assert(not route.empty() || latency, "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", - src->getCname(), dst->getCname()); + src->get_cname(), dst->get_cname()); for (auto const& link : route) - if (link->isOff()) + if (link->is_off()) failed = 1; if (sg_network_crosstraffic == 1) { dst->routeTo(src, back_route, nullptr); for (auto const& link : back_route) - if (link->isOff()) + if (link->is_off()) failed = 1; } @@ -282,7 +269,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 (get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) { action->set_last_update(); } @@ -296,7 +283,7 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); } - action->latCurrent_ = action->latency_; + action->lat_current_ = action->latency_; action->latency_ *= latencyFactor(size); action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); @@ -304,34 +291,39 @@ 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 (get_update_algorithm() == 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() - ? kernel::resource::Action::Type::NORMAL - : kernel::resource::Action::Type::LATENCY); + double date = action->latency_ + action->get_last_update(); + kernel::resource::ActionHeap::Type type; + if (route.empty()) + type = kernel::resource::ActionHeap::Type::normal; + else + type = kernel::resource::ActionHeap::Type::latency; + + XBT_DEBUG("Added action (%p) one latency event at date %f", action, date); + get_action_heap().insert(action, date, type); } } 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( - action->get_variable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); + get_maxmin_system()->update_variable_bound( + action->get_variable(), (action->lat_current_ > 0) ? cfg_tcp_gamma / (2.0 * action->lat_current_) : -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->lat_current_ > 0) + ? std::min(action->rate_, cfg_tcp_gamma / (2.0 * action->lat_current_)) + : action->rate_); } for (auto const& link : route) - maxmin_system_->expand(link->constraint(), action->get_variable(), 1.0); + get_maxmin_system()->expand(link->get_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->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()) @@ -357,7 +349,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - constraint()->unshare(); + get_constraint()->unshare(); simgrid::s4u::Link::onCreation(this->piface_); } @@ -375,14 +367,14 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == stateEvent_) { if (value > 0) - turnOn(); + turn_on(); else { kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; + const kernel::lmm::Element* elem = nullptr; double now = surf_get_clock(); - turnOff(); - while ((var = constraint()->get_variable(&elem))) { + turn_off(); + while ((var = get_constraint()->get_variable(&elem))) { kernel::resource::Action* action = static_cast(var->get_id()); if (action->get_state() == kernel::resource::Action::State::running || @@ -397,29 +389,31 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) xbt_die("Unknown event!\n"); } - XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", constraint()); + XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", + get_constraint()); } void NetworkCm02Link::setBandwidth(double value) { bandwidth_.peak = value; - 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); + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), + sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + TRACE_surf_link_set_bandwidth(surf_get_clock(), get_cname(), + sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); 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_lmm_element_t elem = nullptr; - const_lmm_element_t nextelem = nullptr; + const kernel::lmm::Element* elem = nullptr; + const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; - while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { NetworkCm02Action* action = static_cast(var->get_id()); action->weight_ += delta; if (not action->is_suspended()) - model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); } } } @@ -428,31 +422,31 @@ void NetworkCm02Link::setLatency(double value) { double delta = value - latency_.peak; kernel::lmm::Variable* var = nullptr; - const_lmm_element_t elem = nullptr; - const_lmm_element_t nextelem = nullptr; + const kernel::lmm::Element* elem = nullptr; + const kernel::lmm::Element* nextelem = nullptr; int numelem = 0; latency_.peak = value; - while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { NetworkCm02Action* action = static_cast(var->get_id()); - action->latCurrent_ += delta; + action->lat_current_ += delta; action->weight_ += delta; if (action->rate_ < 0) - model()->get_maxmin_system()->update_variable_bound(action->get_variable(), - sg_tcp_gamma / (2.0 * action->latCurrent_)); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), NetworkModel::cfg_tcp_gamma / + (2.0 * action->lat_current_)); else { - model()->get_maxmin_system()->update_variable_bound( - action->get_variable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); + get_model()->get_maxmin_system()->update_variable_bound( + action->get_variable(), std::min(action->rate_, NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_))); - if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) { + if (action->rate_ < NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)) { XBT_INFO("Flow is limited BYBANDWIDTH"); } else { - XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->latCurrent_); + XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current_); } } if (not action->is_suspended()) - model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); } } @@ -484,7 +478,7 @@ void NetworkCm02Action::update_remains_lazy(double now) if ((get_remains_no_update() <= 0 && (get_variable()->get_weight() > 0)) || ((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) { finish(Action::State::done); - heapRemove(); + get_model()->get_action_heap().remove(this); } set_last_update();