X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8bf0148ee3f17281e1ceef871c388858f613bdb..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 98ee6c599a..8771a39a89 100644
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -4,6 +4,9 @@
 /* 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. */
 
+#include <algorithm>
+#include <utility>
+
 #include "network_ib.hpp"
 #include "simgrid/sg_config.h"
 #include "maxmin_private.hpp"
@@ -11,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
@@ -22,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];
@@ -39,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 !");
   
@@ -53,7 +65,7 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout
     xbt_die("could not find dst node active comms !");  
  // act_dst->rate=rate;
   
-  ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair(act_src, act_dst);
+  ((NetworkIBModel*)surf_network_model)->active_comms[action]=std::make_pair(act_src, act_dst);
   //post the action in the second dist, to retrieve in the other callback
   XBT_DEBUG("IB callback - action %p init", action);
 
@@ -61,8 +73,6 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout
   
 }
 
-
-
 /*********
  * Model *
  *********/
@@ -79,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;
@@ -136,7 +150,7 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
 	my_penalty_out = num_comm_out * Bs;
     }
 
-    max_penalty_out = max(max_penalty_out,my_penalty_out);
+    max_penalty_out = std::max(max_penalty_out,my_penalty_out);
   }
 
   for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
@@ -149,7 +163,7 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
 		      * Be 
 		      * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
     
-    double penalty=max(my_penalty_in,max_penalty_out);
+    double penalty = std::max(my_penalty_in,max_penalty_out);
     
     double rate_before_update = (*it)->action->getBound();
     //save initial rate of the action
@@ -226,3 +240,6 @@ void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode
     delete comm;
   xbt_free(updated);
 }
+
+}
+}