X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b1fb02d6a252c499432b7c90e2d08d5da05b66e..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/surf/network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 4e51c2b2df..5ddb5e2ff4 100644
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -14,7 +14,8 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
-static void IB_create_host_callback(Host* host){
+static void IB_create_host_callback(simgrid::s4u::Host& host){
+  using namespace simgrid::surf;
   
   static int id=0;
 // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
@@ -25,11 +26,15 @@ static void IB_create_host_callback(Host* host){
 
   id++;
   xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
-    host->getName(), act, NULL);
- 
+    host.name().c_str(), act, NULL);
+
 }
 
-static void IB_action_state_changed_callback(NetworkAction *action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
+static void IB_action_state_changed_callback(
+  simgrid::surf::NetworkAction *action,
+  e_surf_action_state_t statein, e_surf_action_state_t stateout)
+{
+ using namespace simgrid::surf;
  if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
     return;
   std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
@@ -42,7 +47,11 @@ static void IB_action_state_changed_callback(NetworkAction *action, e_surf_actio
 }
 
 
-static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, RoutingEdge *dst, double size, double rate){
+static void IB_action_init_callback(
+  simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
+  double size, double rate)
+{
+  using namespace simgrid::surf;
   if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL)
     xbt_die("IB comm added, without any node connected !");
   
@@ -64,8 +73,6 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout
   
 }
 
-
-
 /*********
  * Model *
  *********/
@@ -82,20 +89,24 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout
 /*  } */
 void surf_network_model_init_IB(void)
 {
+  using simgrid::surf::networkActionStateChangedCallbacks;
+  using simgrid::surf::networkCommunicateCallbacks;
 
   if (surf_network_model)
     return;
-  surf_network_model = new NetworkIBModel();
+  surf_network_model = new simgrid::surf::NetworkIBModel();
   net_define_callbacks();
   xbt_dynar_push(all_existing_models, &surf_network_model);
-  surf_callback_connect(networkActionStateChangedCallbacks, IB_action_state_changed_callback);
-  surf_callback_connect(networkCommunicateCallbacks, IB_action_init_callback);
-
-  hostCreatedCallbacks.connect(IB_create_host_callback);
+  networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
+  networkCommunicateCallbacks.connect(IB_action_init_callback);
+  simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
   
 }
 
+namespace simgrid {
+namespace surf {
+
 NetworkIBModel::NetworkIBModel()
  : NetworkSmpiModel() {
   m_haveGap=false;
@@ -134,9 +145,9 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
 
     if(num_comm_out!=1){
       if((*it)->destination->nbActiveCommsDown > 2)//number of comms sent to the receiving node
-	my_penalty_out = num_comm_out * Bs * ys;
+  my_penalty_out = num_comm_out * Bs * ys;
       else
-	my_penalty_out = num_comm_out * Bs;
+  my_penalty_out = num_comm_out * Bs;
     }
 
     max_penalty_out = std::max(max_penalty_out,my_penalty_out);
@@ -149,8 +160,8 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
     int nb_comms = (*it)->destination->nbActiveCommsDown;//total number of incoming comms
     if(nb_comms!=1)
       my_penalty_in = ((*it)->destination->ActiveCommsDown)[root] //number of comm sent to dest by root node
-		      * Be 
-		      * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
+          * Be 
+          * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
     
     double penalty = std::max(my_penalty_in,max_penalty_out);
     
@@ -203,11 +214,11 @@ void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode
 
     to->nbActiveCommsDown--;
     for (std::vector<ActiveComm*>::iterator it= from->ActiveCommsUp.begin(); 
-	 it != from->ActiveCommsUp.end(); ++it) {
+   it != from->ActiveCommsUp.end(); ++it) {
       if((*it)->action==action){
-	comm=(*it);
-	from->ActiveCommsUp.erase(it);
-	break;
+  comm=(*it);
+  from->ActiveCommsUp.erase(it);
+  break;
       }
     }
     action->unref();
@@ -229,3 +240,6 @@ void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode
     delete comm;
   xbt_free(updated);
 }
+
+}
+}