X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7fe297bcf61069ab362adcdc1a177365a0896c7..ecd5f7562caf1d443bf22788fa5f4fac408776ec:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index e1896d35af..915e5c21a9 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -5,11 +5,11 @@ #include -#include "maxmin_private.hpp" #include "network_cm02.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.h" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "surf/maxmin.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); @@ -87,13 +87,14 @@ void surf_network_model_init_Reno() if (surf_network_model) return; - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); + lmm_set_default_protocol_function(simgrid::surf::func_reno_f, simgrid::surf::func_reno_fp, + simgrid::surf::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(&lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve); all_existing_models->push_back(surf_network_model); } @@ -103,13 +104,14 @@ void surf_network_model_init_Reno2() if (surf_network_model) return; - lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); + lmm_set_default_protocol_function(simgrid::surf::func_reno2_f, simgrid::surf::func_reno2_fp, + simgrid::surf::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(&lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve); all_existing_models->push_back(surf_network_model); } @@ -118,13 +120,14 @@ void surf_network_model_init_Vegas() if (surf_network_model) return; - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); + lmm_set_default_protocol_function(simgrid::surf::func_vegas_f, simgrid::surf::func_vegas_fp, + simgrid::surf::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(&lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve); all_existing_models->push_back(surf_network_model); } @@ -149,8 +152,8 @@ NetworkCm02Model::NetworkCm02Model() xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim.c_str()); } - maxminSystem_ = lmm_system_new(selectiveUpdate_); - loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); + maxminSystem_ = new s_lmm_system_t(selectiveUpdate_); + loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); if (getUpdateMechanism() == UM_LAZY) { modifiedSet_ = new ActionLmmList(); @@ -176,13 +179,12 @@ 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 = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable()); + int n = action->getVariable()->get_number_of_constraint(); for (int i = 0; i < n; i++){ - lmm_constraint_t constraint = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i); - NetworkCm02Link *link = static_cast(lmm_constraint_id(constraint)); - double value = lmm_variable_getvalue(action->getVariable())* - lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i); + lmm_constraint_t constraint = action->getVariable()->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()); } @@ -191,7 +193,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) // if I am wearing a latency hat if (action->getHat() == LATENCY) { XBT_DEBUG("Latency paid for action %p. Activating", action); - lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_); + maxminSystem_->update_variable_weight(action->getVariable(), action->weight_); action->heapRemove(getActionHeap()); action->refreshLastUpdate(); @@ -210,51 +212,47 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) void NetworkCm02Model::updateActionsStateFull(double now, double delta) { - ActionList *running_actions = getRunningActionSet(); - ActionList::iterator it(running_actions->begin()); - ActionList::iterator itend(running_actions->end()); - while (it != itend) { - NetworkCm02Action *action = static_cast (&*it); - ++it; - XBT_DEBUG("Something happened to action %p", action); - double deltap = delta; - if (action->latency_ > 0) { - if (action->latency_ > deltap) { - double_update(&(action->latency_), deltap, sg_surf_precision); - deltap = 0.0; - } else { - double_update(&(deltap), action->latency_, sg_surf_precision); - action->latency_ = 0.0; - } - if (action->latency_ <= 0.0 && not action->isSuspended()) - lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_); - } - if (TRACE_is_enabled()) { - int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable()); - for (int i = 0; i < n; i++){ - lmm_constraint_t constraint = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i); - - NetworkCm02Link* link = static_cast(lmm_constraint_id(constraint)); - TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), - (lmm_variable_getvalue(action->getVariable()) * - lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i)), - action->getLastUpdate(), now - action->getLastUpdate()); - } + for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + 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); + double deltap = delta; + if (action.latency_ > 0) { + if (action.latency_ > deltap) { + double_update(&action.latency_, deltap, sg_surf_precision); + deltap = 0.0; + } else { + double_update(&deltap, action.latency_, sg_surf_precision); + action.latency_ = 0.0; } - if (not lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable())) { - /* 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()); + if (action.latency_ <= 0.0 && not action.isSuspended()) + maxminSystem_->update_variable_weight(action.getVariable(), action.weight_); + } + if (TRACE_is_enabled()) { + int n = action.getVariable()->get_number_of_constraint(); + for (int i = 0; i < n; i++) { + lmm_constraint_t constraint = action.getVariable()->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()); } - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); + } + if (not action.getVariable()->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.updateRemains(action.getVariable()->get_value() * delta); - if (action->getMaxDuration() > NO_MAX_DURATION) - action->updateMaxDuration(delta); + if (action.getMaxDuration() > NO_MAX_DURATION) + action.updateMaxDuration(delta); - if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) || - ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { - action->finish(Action::State::done); + if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) || + ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { + action.finish(Action::State::done); } } } @@ -289,7 +287,6 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz action->latency_ = latency; action->rate_ = rate; if (getUpdateMechanism() == UM_LAZY) { - action->updateIndexHeap(-1); action->refreshLastUpdate(); } @@ -311,28 +308,32 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz constraints_per_variable += back_route.size(); if (action->latency_ > 0) { - action->setVariable(lmm_variable_new(maxminSystem_, action, 0.0, -1.0, constraints_per_variable)); + action->setVariable(maxminSystem_->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() ? NORMAL : LATENCY); } } else - action->setVariable(lmm_variable_new(maxminSystem_, action, 1.0, -1.0, constraints_per_variable)); + action->setVariable(maxminSystem_->variable_new(action, 1.0, -1.0, constraints_per_variable)); if (action->rate_ < 0) { - lmm_update_variable_bound(maxminSystem_, action->getVariable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); + maxminSystem_->update_variable_bound(action->getVariable(), + (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); } else { - lmm_update_variable_bound(maxminSystem_, action->getVariable(), (action->latCurrent_ > 0) ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) : action->rate_); + maxminSystem_->update_variable_bound(action->getVariable(), + (action->latCurrent_ > 0) + ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) + : action->rate_); } for (auto const& link : route) - lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), 1.0); + maxminSystem_->expand(link->constraint(), action->getVariable(), 1.0); if (not back_route.empty()) { // sg_network_crosstraffic was activated XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); for (auto const& link : back_route) - lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), .05); + maxminSystem_->expand(link->constraint(), action->getVariable(), .05); //Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency //(You would also have to change lmm_element_concurrency()) @@ -349,7 +350,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz ************/ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, lmm_system_t system) - : LinkImpl(model, name, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth)) + : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth)) { bandwidth_.scale = 1.0; bandwidth_.peak = bandwidth; @@ -358,7 +359,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(constraint()); + constraint()->unshare(); simgrid::s4u::Link::onCreation(this->piface_); } @@ -383,8 +384,8 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) double now = surf_get_clock(); turnOff(); - while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) { - Action *action = static_cast( lmm_variable_id(var) ); + while ((var = constraint()->get_variable(&elem))) { + Action* action = static_cast(var->get_id()); if (action->getState() == Action::State::running || action->getState() == Action::State::ready) { @@ -403,11 +404,10 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) void NetworkCm02Link::setBandwidth(double value) { - bandwidth_.peak = value; - lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(), - sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + 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); if (sg_weight_S_parameter > 0) { @@ -417,11 +417,11 @@ void NetworkCm02Link::setBandwidth(double value) lmm_element_t elem = nullptr; lmm_element_t nextelem = nullptr; int numelem = 0; - while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) { - NetworkCm02Action *action = static_cast(lmm_variable_id(var)); + while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + NetworkCm02Action* action = static_cast(var->get_id()); action->weight_ += delta; if (not action->isSuspended()) - lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_); + model()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_); } } } @@ -436,16 +436,16 @@ void NetworkCm02Link::setLatency(double value) latency_.peak = value; - while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) { - NetworkCm02Action *action = static_cast(lmm_variable_id(var)); + while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + NetworkCm02Action* action = static_cast(var->get_id()); action->latCurrent_ += delta; action->weight_ += delta; if (action->rate_ < 0) - lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), - sg_tcp_gamma / (2.0 * action->latCurrent_)); + model()->getMaxminSystem()->update_variable_bound(action->getVariable(), + sg_tcp_gamma / (2.0 * action->latCurrent_)); else { - lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), - std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); + model()->getMaxminSystem()->update_variable_bound( + action->getVariable(), 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"); @@ -454,7 +454,7 @@ void NetworkCm02Link::setLatency(double value) } } if (not action->isSuspended()) - lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_); + model()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_); } } @@ -482,14 +482,14 @@ void NetworkCm02Action::updateRemainingLazy(double now) setMaxDuration(max_duration); } - if ((getRemainsNoUpdate() <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) || + if ((getRemainsNoUpdate() <= 0 && (getVariable()->get_weight() > 0)) || ((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) { finish(Action::State::done); heapRemove(getModel()->getActionHeap()); } refreshLastUpdate(); - setLastValue(lmm_variable_getvalue(getVariable())); + setLastValue(getVariable()->get_value()); } }