move the vanilla def of executeParallelTask in HostModel

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

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 1ba7a30..8771a39 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -14,7 +14,7 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
-static void IB_create_host_callback(simgrid::surf::Host* host){
+static void IB_create_host_callback(simgrid::s4u::Host& host){
   using namespace simgrid::surf;
   
   static int id=0;
@@ -26,8 +26,8 @@ static void IB_create_host_callback(simgrid::surf::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(
@@ -48,7 +48,7 @@ static void IB_action_state_changed_callback(
 
 
 static void IB_action_init_callback(
-  simgrid::surf::NetworkAction *action, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst,
+  simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
   double size, double rate)
 {
   using namespace simgrid::surf;
@@ -91,7 +91,6 @@ void surf_network_model_init_IB(void)
 {
   using simgrid::surf::networkActionStateChangedCallbacks;
   using simgrid::surf::networkCommunicateCallbacks;
-  using simgrid::surf::hostCreatedCallbacks;
 
   if (surf_network_model)
     return;
@@ -100,7 +99,7 @@ void surf_network_model_init_IB(void)
   xbt_dynar_push(all_existing_models, &surf_network_model);
   networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
   networkCommunicateCallbacks.connect(IB_action_init_callback);
-  hostCreatedCallbacks.connect(IB_create_host_callback);
+  simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
   
 }