Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / surf / network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 7b743d5..de2c180 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -33,10 +33,10 @@ static void IB_create_host_callback(simgrid::s4u::Host& host){
 
 static void IB_action_state_changed_callback(
     simgrid::surf::NetworkAction *action,
-    e_surf_action_state_t statein, e_surf_action_state_t stateout)
+    simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout)
 {
   using namespace simgrid::surf;
-  if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
+  if(statein!=simgrid::surf::Action::State::running || stateout!=simgrid::surf::Action::State::done)
     return;
   std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
   XBT_DEBUG("IB callback - action %p finished", action);
@@ -113,7 +113,7 @@ namespace simgrid {
 
     NetworkIBModel::NetworkIBModel()
     : NetworkSmpiModel() {
-      m_haveGap=false;
+      haveGap_=false;
       active_nodes=NULL;
 
       const char* IB_factors_string=sg_cfg_get_string("smpi/IB_penalty_factors");
@@ -178,7 +178,7 @@ namespace simgrid {
 
         if (!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(p_maxminSystem, (*it)->action->getVariable(), penalized_bw);
+          lmm_update_variable_bound(maxminSystem_, (*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 );
         }