body count++: routing_get_latency_and_bandwidth

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

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 8649f82..fd34a63 100644 (file)
--- 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);
 
@@ -232,11 +233,11 @@ static void define_callbacks_ns3(void)
 {
   simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
   simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
-  sg_platf_link_add_cb (&parse_ns3_add_link);
-  sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
+  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
 }
 
 /*********
@@ -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)
 {
 
 }