X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bd1bbd35034c2e93a030a676dc244ad2cf74c70..c1139d8e995d20f3afebc6cb69c66c155348dbdd:/src/surf/network_ib.cpp diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 8a051ec09b..c37b9f5684 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -7,8 +7,8 @@ #include #include "simgrid/sg_config.h" +#include "src/kernel/lmm/maxmin.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/maxmin_private.hpp" #include "src/surf/network_ib.hpp" #include "src/surf/xml/platf.hpp" #include @@ -34,7 +34,7 @@ static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* actio using simgrid::surf::NetworkIBModel; using simgrid::surf::IBNode; - if (action->getState() != simgrid::surf::Action::State::done) + if (action->getState() != simgrid::kernel::resource::Action::State::done) return; std::pair pair = ((NetworkIBModel*)surf_network_model)->active_comms[action]; XBT_DEBUG("IB callback - action %p finished", action); @@ -174,7 +174,7 @@ void NetworkIBModel::computeIBfactors(IBNode* root) if (not double_equals(penalized_bw, rate_before_update, sg_surf_precision)) { XBT_DEBUG("%d->%d action %p penalty updated : bw now %f, before %f , initial rate %f", root->id, (*it)->destination->id, (*it)->action, penalized_bw, (*it)->action->getBound(), (*it)->init_rate); - lmm_update_variable_bound(maxminSystem_, (*it)->action->getVariable(), penalized_bw); + maxmin_system_->update_variable_bound((*it)->action->getVariable(), penalized_bw); } else { XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id, (*it)->destination->id, (*it)->action, penalized_bw, (*it)->init_rate);