X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d51ce64afb2cd0aa5cdb24bec75b33311a48be1..0eead244337fde8f0508629f8f8473f946c19f88:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 6c9f32ef4e..78a41cfe66 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -5,10 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid_config.h" -#include "src/surf/network_interface.hpp" #include "src/instr/instr_private.h" -#include "surf/surf.h" +#include "src/kernel/routing/NetCard.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/surf_private.h" +#include "surf/surf.h" typedef enum { INSTR_US_DECLARE, @@ -319,11 +320,10 @@ static void instr_user_srcdst_variable(double time, const char *src, const char if(!dst_elm) xbt_die("Element '%s' not found!",dst); - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency (src_elm, dst_elm, route,nullptr); - for (auto link : *route) + std::vector route; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr); + for (auto link : route) instr_user_variable (time, link->getName(), variable, father_type, value, what, nullptr, user_link_variables); - delete route; } /** \ingroup TRACE_API