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

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 9ccded3a84..fd34a63232 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -8,6 +8,7 @@
 #include "src/surf/surf_private.h"
 #include "src/surf/host_interface.hpp"
 #include "simgrid/sg_config.h"
+#include "src/surf/platform.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
 
@@ -39,11 +40,11 @@ static void replace_lat_ns3(char ** lat)
   xbt_free(temp);
 }
 
-static void simgrid_ns3_add_host(simgrid::surf::Host* host)
+static void simgrid_ns3_add_host(simgrid::s4u::Host& host)
 {
-  const char* id = host->getName();
+  const char* id = host.name().c_str();
   XBT_DEBUG("NS3_ADD_HOST '%s'", id);
-  host->getHost()->extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
+  host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
 }
 
 static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
@@ -110,7 +111,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
       start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
       xbt_dynar_push_as(tab_elements_num, int, start);
       router_id = bprintf("ns3_%s%d%s", cluster_prefix, start, cluster_suffix);
-      simgrid::Host::by_name_or_create(router_id)
+      simgrid::s4u::Host::by_name_or_create(router_id)
         ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
       XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
       free(router_id);
@@ -122,7 +123,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
       for (i = start; i <= end; i++){
         xbt_dynar_push_as(tab_elements_num, int, i);
         router_id = bprintf("ns3_%s%d%s", cluster_prefix, i, cluster_suffix);
-        simgrid::Host::by_name_or_create(router_id)
+        simgrid::s4u::Host::by_name_or_create(router_id)
           ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
         XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
         free(router_id);
@@ -230,13 +231,13 @@ static void parse_ns3_end_platform(void)
 
 static void define_callbacks_ns3(void)
 {
-  simgrid::surf::Host::onCreation.connect(simgrid_ns3_add_host);
-  simgrid::surf::routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
-  sg_platf_link_add_cb (&parse_ns3_add_link);
-  sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
+  simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
+  simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
+  simgrid::surf::on_link.connect (&parse_ns3_add_link);
+  simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
   simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
-  sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes
-  sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes
+  simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes
+  simgrid::surf::on_postparse.connect(&parse_ns3_end_platform); //InitializeRoutes
 }
 
 /*********
@@ -273,7 +274,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
   routing_model_create(NULL);
   define_callbacks_ns3();
 
-  NS3_EXTENSION_ID = simgrid::Host::extension_create(free_ns3_host);
+  NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(free_ns3_host);
   NS3_ASR_LEVEL  = xbt_lib_add_level(as_router_lib, free_ns3_host);
 }
 
@@ -306,8 +307,7 @@ Link* NetworkNS3Model::createLink(const char *name,
 xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
 {
   xbt_dynar_t route = NULL;
-  routing_get_route_and_latency(src, dst, &route, NULL);
-  //routing_platf->getRouteAndLatency(src, dst, &route, NULL);
+  routing_platf->getRouteAndLatency(src, dst, &route, NULL);
   return route;
 }
 
@@ -378,7 +378,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
 
     	xbt_dynar_t route = NULL;
 
-    	routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL);
+    	routing_platf->getRouteAndLatency (action->p_srcElm, action->p_dstElm, &route, NULL);
     	unsigned int i;
     	for (i = 0; i < xbt_dynar_length (route); i++){
     		NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
@@ -427,7 +427,7 @@ NetworkNS3Link::~NetworkNS3Link()
 {
 }
 
-void NetworkNS3Link::updateState(tmgr_trace_event_t event_type, double value, double date)
+void NetworkNS3Link::updateState(tmgr_trace_iterator_t event_type, double value, double date)
 {
 
 }