[mc] Initial support MC record/replay

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

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 5be0d3e..de303c9 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -10,11 +10,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
-double Bs=0.925;
-double Be=0.965;
-double ys=1.35;
-
-
 static void IB_create_host_callback(sg_platf_host_cbarg_t t){
   
   static int id=0;
@@ -33,7 +28,7 @@ static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_act
  if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
     return;
   std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
-  XBT_VERB("action %p finished", action);
+  XBT_DEBUG("IB callback - action %p finished", action);
  
  ((NetworkIBModel*)surf_network_model)->updateIBfactors(action, pair.first, pair.second, 1);
 
@@ -58,7 +53,7 @@ static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src,
   
   ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair<IBNode*,IBNode*>(act_src, act_dst);
   //post the action in the second dist, to retrieve in the other callback
-  XBT_VERB("action %p init", action);
+  XBT_DEBUG("IB callback - action %p init", action);
 
   ((NetworkIBModel*)surf_network_model)->updateIBfactors(action, act_src, act_dst, 0);
   
@@ -93,12 +88,25 @@ void surf_network_model_init_IB(void)
 
   sg_platf_host_add_cb(IB_create_host_callback);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
+  
 }
 
 NetworkIBModel::NetworkIBModel()
  : NetworkSmpiModel() {
   m_haveGap=false;
   active_nodes=NULL;
+    
+  const char* IB_factors_string=sg_cfg_get_string("smpi/IB_penalty_factors");
+  xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
+  
+  if(xbt_dynar_length(radical_elements)!=3)
+    surf_parse_error("smpi/IB_penalty_factors should be provided and contain 3 elements, semi-colon separated : for example 0.965;0.925;1.35");
+  
+  Be = atof(xbt_dynar_get_as(radical_elements, 0, char *));
+  Bs = atof(xbt_dynar_get_as(radical_elements, 1, char *));
+  ys = atof(xbt_dynar_get_as(radical_elements, 2, char *));
+
+  xbt_dynar_free(&radical_elements);
 }
 
 NetworkIBModel::~NetworkIBModel()
@@ -149,19 +157,19 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
     penalized_bw= ! num_comm_out ? (*it)->init_rate : (*it)->init_rate /penalty;
     
     if (!double_equals(penalized_bw, rate_before_update, sg_surf_precision)){
-     // XBT_VERB("%d->%d action %p penalty updated : in %f, out %f, final %f, before %f , initial rate %f", root->id,(*it)->destination->id,(*it)->action,my_penalty_in,my_penalty_out,penalized_bw, (*it)->action->getBound(), (*it)->init_rate );
+      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);
-    }/*else{
-     // XBT_VERB("%d->%d action %p penalty not updated : in %f, out %f, final %f, initial rate %f", root->id,(*it)->destination->id,(*it)->action,my_penalty_in,my_penalty_out,penalized_bw, (*it)->init_rate );
-    }*/
+    }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 );
+    }
 
   }
-  XBT_VERB("Finished computing");
+  XBT_DEBUG("Finished computing IB penalties");
 }
 
 void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) {
   if(updatedlist[root->id]==0){
-    XBT_VERB("Updating rec %d", root->id);
+    XBT_DEBUG("IB - Updating rec %d", root->id);
     computeIBfactors(root);
     updatedlist[root->id]=1;
     for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
@@ -191,24 +199,16 @@ void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNo
     to->nbActiveCommsDown--;
     for (std::vector<ActiveComm*>::iterator it= from->ActiveCommsUp.begin(); 
         it != from->ActiveCommsUp.end(); ++it) {
-      XBT_VERB("inside vector");
       if((*it)->action==action){
        comm=(*it);
        from->ActiveCommsUp.erase(it);
-        XBT_VERB("action deleted");
        break;
       }
     }
     action->unref();
-    /*from->ActiveCommsUp.erase(
-        std::remove(from->ActiveCommsUp.begin(),
-            from->ActiveCommsUp.end(), make_pair(to, action)),
-            from->ActiveCommsUp.end());*/
 
   }else{
-    //from->ActiveCommsUp.push_back(std::make_pair(to, action));
     action->ref();
-
     ActiveComm* comm=new ActiveComm();
     comm->action=action;
     comm->destination=to;
@@ -217,9 +217,10 @@ void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNo
     to->ActiveCommsDown[from]+=1;
     to->nbActiveCommsDown++;
   }
-  XBT_VERB("Updating %d", from->id);
+  XBT_DEBUG("IB - Updating %d", from->id);
   updateIBfactors_rec(from, updated);
-  XBT_VERB("Finished updating %d", from->id);
-  if(comm)delete comm;
+  XBT_DEBUG("IB - Finished updating %d", from->id);
+  if(comm)
+    delete comm;
   xbt_free(updated);
 }