X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98cae3c5c7d1c252761a850f20e7df049080e87d..83f9c73b8685ea0f92712b9f05dc4c8431950358:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 8dfd00c64a..6af90f2fd1 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -4,10 +4,17 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "simgrid/s4u/engine.hpp" +#include "simgrid/s4u/host.hpp" + +#include +#include +#include + +#include +#include + #include "src/instr/instr_private.h" -#include "xbt/lib.h" -#include "surf/surf.h" -#include "surf/surf_routing.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); @@ -65,11 +72,11 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe xbt_assert(newContainer->netcard, "Element '%s' not found",name); break; case INSTR_ROUTER: - newContainer->netcard = static_cast(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL)); + newContainer->netcard = simgrid::s4u::Engine::instance()->netcardByNameOrNull(name); xbt_assert(newContainer->netcard, "Element '%s' not found",name); break; case INSTR_AS: - newContainer->netcard = static_cast(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL)); + newContainer->netcard = simgrid::s4u::Engine::instance()->netcardByNameOrNull(name); xbt_assert(newContainer->netcard, "Element '%s' not found",name); break; default: