X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec38e1b35a34ad8c6ce3e75506ea5bcd8d96e323..7f3527d281baac664d10ce7086e0d0138e1389d7:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 43bc60e70c..615c4ea548 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -87,8 +87,8 @@ void surf_network_model_init_Reno() if (surf_network_model) return; - lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp, - simgrid::kernel::lmm::func_reno_fpi); + set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp, + simgrid::kernel::lmm::func_reno_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); @@ -104,8 +104,8 @@ void surf_network_model_init_Reno2() if (surf_network_model) return; - lmm_set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp, - simgrid::kernel::lmm::func_reno2_fpi); + set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp, + simgrid::kernel::lmm::func_reno2_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); @@ -120,8 +120,8 @@ void surf_network_model_init_Vegas() if (surf_network_model) return; - lmm_set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp, - simgrid::kernel::lmm::func_vegas_fpi); + set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp, + simgrid::kernel::lmm::func_vegas_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); @@ -152,7 +152,7 @@ NetworkCm02Model::NetworkCm02Model() xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim.c_str()); } - maxminSystem_ = new simgrid::kernel::lmm::s_lmm_system_t(selectiveUpdate_); + maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_); loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); if (getUpdateMechanism() == UM_LAZY) { @@ -160,8 +160,8 @@ NetworkCm02Model::NetworkCm02Model() maxminSystem_->keep_track = modifiedSet_; } } -NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) - : NetworkCm02Model() + +NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) : NetworkCm02Model() { maxminSystem_->solve_fun = specificSolveFun; } @@ -182,7 +182,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) int n = action->getVariable()->get_number_of_constraint(); for (int i = 0; i < n; i++){ - lmm_constraint_t constraint = action->getVariable()->get_constraint(i); + kernel::lmm::Constraint* 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(), @@ -191,16 +191,16 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) } // if I am wearing a latency hat - if (action->getHat() == LATENCY) { + if (action->getHat() == 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(); // if I am wearing a max_duration or normal hat - } else if (action->getHat() == MAX_DURATION || action->getHat() == NORMAL) { - // no need to communicate anymore - // assume that flows that reached max_duration have remaining of 0 + } else if (action->getHat() == Action::Type::MAX_DURATION || action->getHat() == 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(Action::State::done); @@ -231,7 +231,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) 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); + kernel::lmm::Constraint* constraint = action.getVariable()->get_constraint(i); NetworkCm02Link* link = static_cast(constraint->get_id()); TRACE_surf_link_set_utilization( link->getCname(), action.getCategory(), @@ -312,7 +312,8 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz 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); + action->heapInsert(getActionHeap(), action->latency_ + action->getLastUpdate(), + route.empty() ? Action::Type::NORMAL : Action::Type::LATENCY); } } else action->setVariable(maxminSystem_->variable_new(action, 1.0, -1.0, constraints_per_variable)); @@ -331,7 +332,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz 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%%"); + XBT_DEBUG("Crosstraffic active adding backward flow using 5%%"); for (auto const& link : back_route) maxminSystem_->expand(link->constraint(), action->getVariable(), .05); @@ -379,7 +380,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) if (value > 0) turnOn(); else { - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; const_lmm_element_t elem = nullptr; double now = surf_get_clock(); @@ -413,7 +414,7 @@ void NetworkCm02Link::setBandwidth(double value) if (sg_weight_S_parameter > 0) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); - lmm_variable_t var; + kernel::lmm::Variable* var; const_lmm_element_t elem = nullptr; const_lmm_element_t nextelem = nullptr; int numelem = 0; @@ -429,7 +430,7 @@ void NetworkCm02Link::setBandwidth(double value) void NetworkCm02Link::setLatency(double value) { double delta = value - latency_.peak; - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; const_lmm_element_t elem = nullptr; const_lmm_element_t nextelem = nullptr; int numelem = 0; @@ -464,7 +465,7 @@ void NetworkCm02Link::setLatency(double value) void NetworkCm02Action::updateRemainingLazy(double now) { - if (suspended_ != 0) + if (suspended_ != Action::SuspendStates::not_suspended) return; double delta = now - getLastUpdate();