X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/265e908745398dd4e9cc55187aa267650468c57c..3056e7eed34d3b9ec18341b4c4279071bc6b428c:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 87c29933ef..52ebc62c91 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -4,12 +4,14 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include +#include #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" +#include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); @@ -17,9 +19,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; - /************************************************************************/ /* New model based on optimizations discussed during Pedro Velho's thesis*/ /************************************************************************/ @@ -39,12 +38,12 @@ void surf_network_model_init_LegrandVelho() if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); all_existing_models->push_back(surf_network_model); - 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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); } /***************************************************************************/ @@ -64,11 +63,11 @@ void surf_network_model_init_CM02() if (surf_network_model) return; - xbt_cfg_setdefault_double("network/latency-factor", 1.0); - xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0); - xbt_cfg_setdefault_double("network/weight-S", 0.0); + simgrid::config::set_default("network/latency-factor", 1.0); + simgrid::config::set_default("network/bandwidth-factor", 1.0); + simgrid::config::set_default("network/weight-S", 0.0); - surf_network_model = new simgrid::surf::NetworkCm02Model(); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(); all_existing_models->push_back(surf_network_model); } @@ -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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + surf_network_model = new simgrid::kernel::resource::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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } @@ -120,96 +119,83 @@ 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); + simgrid::config::set_default("network/latency-factor", 13.01); + simgrid::config::set_default("network/bandwidth-factor", 0.97); + simgrid::config::set_default("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system); all_existing_models->push_back(surf_network_model); } namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { -NetworkCm02Model::NetworkCm02Model() - :NetworkModel() +NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool)) + : NetworkModel(simgrid::config::get_value("network/optim") == "Full" ? Model::UpdateAlgo::Full + : Model::UpdateAlgo::Lazy) { - std::string optim = xbt_cfg_get_string("network/optim"); - bool select = xbt_cfg_get_boolean("network/maxmin-selective-update"); + std::string optim = simgrid::config::get_value("network/optim"); + bool select = simgrid::config::get_value("network/maxmin-selective-update"); - if (optim == "Full") { - setUpdateMechanism(UM_FULL); - } else if (optim == "Lazy") { + if (optim == "Lazy") { + xbt_assert(select || simgrid::config::is_default("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); - 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; + set_maxmin_system(make_new_lmm_system(select)); + loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); } LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) + s4u::Link::SharingPolicy 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)) { + 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->getVariable()->get_number_of_constraint(); + int n = action->get_variable()->get_number_of_constraint(); for (int i = 0; i < n; i++){ - kernel::lmm::Constraint* constraint = action->getVariable()->get_constraint(i); + kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i); NetworkCm02Link* link = static_cast(constraint->get_id()); - double value = action->getVariable()->get_value() * action->getVariable()->get_constraint_weight(i); - TRACE_surf_link_set_utilization(link->getCname(), action->get_category(), value, action->getLastUpdate(), - now - action->getLastUpdate()); + double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i); + 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->getType() == kernel::resource::Action::Type::LATENCY) { + if (action->get_type() == ActionHeap::Type::latency) { XBT_DEBUG("Latency paid for action %p. Activating", action); - maxmin_system_->update_variable_weight(action->getVariable(), action->weight_); - action->heapRemove(getActionHeap()); - action->refreshLastUpdate(); + 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->getType() == kernel::resource::Action::Type::MAX_DURATION || - action->getType() == kernel::resource::Action::Type::NORMAL) { + // if I am wearing a max_duration or normal hat + } else if (action->get_type() == ActionHeap::Type::max_duration || action->get_type() == 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(getActionHeap()); + action->finish(Action::State::done); + get_action_heap().remove(action); } } } - -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,81 +209,79 @@ 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.getVariable(), action.weight_); + get_maxmin_system()->update_variable_weight(action.get_variable(), action.weight_); } if (TRACE_is_enabled()) { - int n = action.getVariable()->get_number_of_constraint(); + int n = action.get_variable()->get_number_of_constraint(); for (int i = 0; i < n; i++) { - kernel::lmm::Constraint* constraint = action.getVariable()->get_constraint(i); + 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(), - (action.getVariable()->get_value() * action.getVariable()->get_constraint_weight(i)), - action.getLastUpdate(), now - action.getLastUpdate()); + 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()); } } - if (not action.getVariable()->get_number_of_constraint()) { + if (not action.get_variable()->get_number_of_constraint()) { /* There is actually no link used, hence an infinite bandwidth. This happens often when using models like * vivaldi. In such case, just make sure that the action completes immediately. */ action.update_remains(action.get_remains()); } - action.update_remains(action.getVariable()->get_value() * delta); + action.update_remains(action.get_variable()->get_value() * delta); if (action.get_max_duration() > NO_MAX_DURATION) action.update_max_duration(delta); - if (((action.get_remains() <= 0) && (action.getVariable()->get_weight() > 0)) || + if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { - action.finish(kernel::resource::Action::State::done); + action.finish(Action::State::done); } } } -kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - int failed = 0; + bool failed = false; double latency = 0.0; 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()) - failed = 1; + failed = std::any_of(route.begin(), route.end(), [](LinkImpl* link) { return link->is_off(); }); - if (sg_network_crosstraffic == 1) { + if (cfg_crosstraffic) { dst->routeTo(src, back_route, nullptr); - for (auto const& link : back_route) - if (link->isOff()) - failed = 1; + failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); }); } NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); action->weight_ = latency; action->latency_ = latency; action->rate_ = rate; - if (getUpdateMechanism() == UM_LAZY) { - action->refreshLastUpdate(); + if (get_update_algorithm() == Model::UpdateAlgo::Lazy) { + action->set_last_update(); } - double bandwidth_bound = -1.0; - if (sg_weight_S_parameter > 0) - for (auto const& link : route) - action->weight_ += sg_weight_S_parameter / link->bandwidth(); - - for (auto const& link : route) { - double bb = bandwidthFactor(size) * link->bandwidth(); - bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); + if (sg_weight_S_parameter > 0) { + action->weight_ = + std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) { + return total + sg_weight_S_parameter / link->bandwidth(); + }); } - action->latCurrent_ = action->latency_; + double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth(); + + for (auto const& link : route) + bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth()); + + action->lat_current_ = action->latency_; action->latency_ *= latencyFactor(size); action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); @@ -305,34 +289,36 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos constraints_per_variable += back_route.size(); if (action->latency_ > 0) { - action->setVariable(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() == 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->getLastUpdate()); - action->heapInsert(getActionHeap(), action->latency_ + action->getLastUpdate(), - route.empty() ? kernel::resource::Action::Type::NORMAL - : kernel::resource::Action::Type::LATENCY); + double date = action->latency_ + action->get_last_update(); + + ActionHeap::Type type = route.empty() ? ActionHeap::Type::normal : 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->setVariable(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->getVariable(), (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->getVariable(), - (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->getVariable(), 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%%"); + if (cfg_crosstraffic) { + XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth"); for (auto const& link : back_route) - maxmin_system_->expand(link->constraint(), action->getVariable(), .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()) @@ -348,7 +334,7 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos * Resource * ************/ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, kernel::lmm::System* system) + s4u::Link::SharingPolicy policy, kernel::lmm::System* system) : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth)) { bandwidth_.scale = 1.0; @@ -357,8 +343,8 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam latency_.scale = 1.0; latency_.peak = latency; - if (policy == SURF_LINK_FATPIPE) - constraint()->unshare(); + if (policy == s4u::Link::SharingPolicy::FATPIPE) + get_constraint()->unshare(); simgrid::s4u::Link::onCreation(this->piface_); } @@ -376,20 +362,19 @@ 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))) { - kernel::resource::Action* action = static_cast(var->get_id()); + turn_off(); + while ((var = get_constraint()->get_variable(&elem))) { + Action* action = static_cast(var->get_id()); - if (action->get_state() == kernel::resource::Action::State::running || - action->get_state() == kernel::resource::Action::State::ready) { + if (action->get_state() == Action::State::running || action->get_state() == Action::State::ready) { action->set_finish_time(now); - action->set_state(kernel::resource::Action::State::failed); + action->set_state(Action::State::failed); } } } @@ -398,29 +383,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()->getMaxminSystem()->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()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); } } } @@ -429,31 +416,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()->getMaxminSystem()->update_variable_bound(action->getVariable(), - 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()->getMaxminSystem()->update_variable_bound( - action->getVariable(), 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()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_); + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_); } } @@ -466,13 +453,13 @@ void NetworkCm02Action::update_remains_lazy(double now) if (suspended_ != Action::SuspendStates::not_suspended) return; - double delta = now - getLastUpdate(); + double delta = now - get_last_update(); double max_duration = get_max_duration(); if (get_remains_no_update() > 0) { XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), - getLastUpdate()); - update_remains(getLastValue() * delta); + get_last_update()); + update_remains(get_last_value() * delta); XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update()); } @@ -482,15 +469,16 @@ void NetworkCm02Action::update_remains_lazy(double now) set_max_duration(max_duration); } - if ((get_remains_no_update() <= 0 && (getVariable()->get_weight() > 0)) || + 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()->getActionHeap()); + get_model()->get_action_heap().remove(this); } - refreshLastUpdate(); - setLastValue(getVariable()->get_value()); + set_last_update(); + set_last_value(get_variable()->get_value()); } } } +} // namespace simgrid