From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 26 Nov 2015 08:47:47 +0000 (+0100)
Subject: [ns3] Move host creation callbacks to hostCreatedCallbacks
X-Git-Tag: v3_13~1540
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd3b19b016099e355f14c3d49d6b7fcc4af78fd7

[ns3] Move host creation callbacks to hostCreatedCallbacks
---

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 9bc6234beb..106a7a40a7 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -6,6 +6,7 @@
 
 #include "src/surf/network_ns3.hpp"
 #include "src/surf/surf_private.h"
+#include "src/surf/host_interface.hpp"
 #include "simgrid/sg_config.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
@@ -39,13 +40,14 @@ static void replace_lat_ns3(char ** lat)
   xbt_free(temp);
 }
 
-static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
+static void simgrid_ns3_add_host(Host* host)
 {
-  XBT_DEBUG("NS3_ADD_HOST '%s'",host->id);
+  const char* id = host->getName();
+  XBT_DEBUG("NS3_ADD_HOST '%s'", id);
   xbt_lib_set(host_lib,
-              host->id,
+              id,
               NS3_HOST_LEVEL,
-              ns3_add_host(host->id)
+              ns3_add_host(id)
     );
 }
 
@@ -240,7 +242,7 @@ static void parse_ns3_end_platform(void)
 
 static void define_callbacks_ns3(void)
 {
-  sg_platf_host_add_cb (&parse_ns3_add_host);
+  hostCreatedCallbacks.connect(simgrid_ns3_add_host);
   sg_platf_router_add_cb (&parse_ns3_add_router);
   sg_platf_link_add_cb (&parse_ns3_add_link);
   sg_platf_cluster_add_cb (&parse_ns3_add_cluster);