Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'coverity_scan' of github.com:mquinson/simgrid
[simgrid.git] / src / instr / instr_interface.cpp
index f4f8c4e..84d70e6 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "simgrid_config.h"
 
+#include "src/surf/network_interface.hpp"
 #include "src/instr/instr_private.h"
 #include "surf/surf.h"
 #include "src/surf/surf_private.h"
@@ -364,13 +365,13 @@ static void instr_user_srcdst_variable(double time,
                               InstrUserVariable what)
 {
   xbt_dynar_t route=NULL;
-  sg_netcard_t src_elm = sg_routing_edge_by_name_or_null(src);
+  sg_netcard_t src_elm = sg_netcard_by_name_or_null(src);
   if(!src_elm) xbt_die("Element '%s' not found!",src);
 
-  sg_netcard_t dst_elm = sg_routing_edge_by_name_or_null(dst);
+  sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);
   if(!dst_elm) xbt_die("Element '%s' not found!",dst);
 
-  routing_get_route_and_latency (src_elm, dst_elm, &route,NULL);
+  routing_platf->getRouteAndLatency (src_elm, dst_elm, &route,NULL);
   unsigned int i;
   surf_cpp_resource_t link;
   xbt_dynar_foreach (route, i, link) {