X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9966aa66acc63c0417fbeae8e3ff12bccb0cdb0..1aaf3e3fc120f9434c692f1c49d03a00b24e55a1:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 68051c7380..01a14eaa91 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -142,34 +142,31 @@ NetworkCm02Model::NetworkCm02Model() if (optim == "Full") { setUpdateMechanism(UM_FULL); - selectiveUpdate_ = select; } else if (optim == "Lazy") { + select = true; setUpdateMechanism(UM_LAZY); - selectiveUpdate_ = true; 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()); } - maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_); + maxmin_system_ = new simgrid::kernel::lmm::System(select); loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); - if (getUpdateMechanism() == UM_LAZY) { - modifiedSet_ = new kernel::resource::ActionLmmList(); - maxminSystem_->keep_track = modifiedSet_; - } + if (getUpdateMechanism() == UM_LAZY) + maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet(); } -NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) : NetworkCm02Model() +NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(kernel::lmm::System* self)) : NetworkCm02Model() { - maxminSystem_->solve_fun = specificSolveFun; + 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, maxminSystem_); + return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxmin_system_); } void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) @@ -179,33 +176,32 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) NetworkCm02Action* action = static_cast(actionHeapPop()); 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->getCategory(), 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->getCname(), 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() == kernel::resource::Action::Type::LATENCY) { XBT_DEBUG("Latency paid for action %p. Activating", action); - maxminSystem_->update_variable_weight(action->getVariable(), action->weight_); - action->heapRemove(getActionHeap()); - action->refreshLastUpdate(); + maxmin_system_->update_variable_weight(action->get_variable(), action->weight_); + action->heapRemove(); + 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() == kernel::resource::Action::Type::MAX_DURATION || + action->get_type() == kernel::resource::Action::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->setRemains(0); action->finish(kernel::resource::Action::State::done); - action->heapRemove(getActionHeap()); + action->heapRemove(); } } } @@ -226,33 +222,33 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) double_update(&deltap, action.latency_, sg_surf_precision); action.latency_ = 0.0; } - if (action.latency_ <= 0.0 && not action.isSuspended()) - maxminSystem_->update_variable_weight(action.getVariable(), action.weight_); + if (action.latency_ <= 0.0 && not action.is_suspended()) + 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.getCategory(), - (action.getVariable()->get_value() * action.getVariable()->get_constraint_weight(i)), - action.getLastUpdate(), now - action.getLastUpdate()); + link->getCname(), 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.updateRemains(action.getRemains()); + action.update_remains(action.get_remains()); } - action.updateRemains(action.getVariable()->get_value() * delta); + action.update_remains(action.get_variable()->get_value() * delta); - if (action.getMaxDuration() > NO_MAX_DURATION) - action.updateMaxDuration(delta); + if (action.get_max_duration() > NO_MAX_DURATION) + action.update_max_duration(delta); - if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) || - ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 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); } } @@ -288,7 +284,7 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos action->latency_ = latency; action->rate_ = rate; if (getUpdateMechanism() == UM_LAZY) { - action->refreshLastUpdate(); + action->set_last_update(); } double bandwidth_bound = -1.0; @@ -309,34 +305,34 @@ kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Hos constraints_per_variable += back_route.size(); if (action->latency_ > 0) { - action->setVariable(maxminSystem_->variable_new(action, 0.0, -1.0, constraints_per_variable)); + action->set_variable(maxmin_system_->variable_new(action, 0.0, -1.0, constraints_per_variable)); if (getUpdateMechanism() == UM_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); + 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); } } else - action->setVariable(maxminSystem_->variable_new(action, 1.0, -1.0, constraints_per_variable)); + action->set_variable(maxmin_system_->variable_new(action, 1.0, -1.0, constraints_per_variable)); if (action->rate_ < 0) { - maxminSystem_->update_variable_bound(action->getVariable(), - (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); + maxmin_system_->update_variable_bound( + action->get_variable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); } else { - maxminSystem_->update_variable_bound(action->getVariable(), - (action->latCurrent_ > 0) - ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) - : action->rate_); + 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) - maxminSystem_->expand(link->constraint(), action->getVariable(), 1.0); + 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) - maxminSystem_->expand(link->constraint(), action->getVariable(), .05); + 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()) @@ -352,7 +348,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, lmm_system_t system) + e_surf_link_sharing_policy_t policy, kernel::lmm::System* system) : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth)) { bandwidth_.scale = 1.0; @@ -390,10 +386,10 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) while ((var = constraint()->get_variable(&elem))) { kernel::resource::Action* action = static_cast(var->get_id()); - if (action->getState() == kernel::resource::Action::State::running || - action->getState() == kernel::resource::Action::State::ready) { - action->setFinishTime(now); - action->setState(kernel::resource::Action::State::failed); + if (action->get_state() == kernel::resource::Action::State::running || + action->get_state() == kernel::resource::Action::State::ready) { + action->set_finish_time(now); + action->set_state(kernel::resource::Action::State::failed); } } } @@ -423,8 +419,8 @@ void NetworkCm02Link::setBandwidth(double value) while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { NetworkCm02Action* action = static_cast(var->get_id()); action->weight_ += delta; - if (not action->isSuspended()) - model()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_); + if (not action->is_suspended()) + model()->getMaxminSystem()->update_variable_weight(action->get_variable(), action->weight_); } } } @@ -444,11 +440,11 @@ void NetworkCm02Link::setLatency(double value) action->latCurrent_ += delta; action->weight_ += delta; if (action->rate_ < 0) - model()->getMaxminSystem()->update_variable_bound(action->getVariable(), + model()->getMaxminSystem()->update_variable_bound(action->get_variable(), sg_tcp_gamma / (2.0 * action->latCurrent_)); else { model()->getMaxminSystem()->update_variable_bound( - action->getVariable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); + action->get_variable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) { XBT_INFO("Flow is limited BYBANDWIDTH"); @@ -456,8 +452,8 @@ void NetworkCm02Link::setLatency(double value) XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->latCurrent_); } } - if (not action->isSuspended()) - model()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_); + if (not action->is_suspended()) + model()->getMaxminSystem()->update_variable_weight(action->get_variable(), action->weight_); } } @@ -465,34 +461,35 @@ void NetworkCm02Link::setLatency(double value) * Action * **********/ -void NetworkCm02Action::updateRemainingLazy(double now) +void NetworkCm02Action::update_remains_lazy(double now) { if (suspended_ != Action::SuspendStates::not_suspended) return; - double delta = now - getLastUpdate(); - double max_duration = getMaxDuration(); + double delta = now - get_last_update(); + double max_duration = get_max_duration(); - if (getRemainsNoUpdate() > 0) { - XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, getRemainsNoUpdate(), getLastUpdate()); - updateRemains(getLastValue() * delta); + if (get_remains_no_update() > 0) { + XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), + get_last_update()); + update_remains(get_last_value() * delta); - XBT_DEBUG("Updating action(%p): remains is now %f", this, getRemainsNoUpdate()); + XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update()); } if (max_duration > NO_MAX_DURATION) { double_update(&max_duration, delta, sg_surf_precision); - setMaxDuration(max_duration); + set_max_duration(max_duration); } - if ((getRemainsNoUpdate() <= 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(getModel()->getActionHeap()); + heapRemove(); } - refreshLastUpdate(); - setLastValue(getVariable()->get_value()); + set_last_update(); + set_last_value(get_variable()->get_value()); } }