-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
/* 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 "src/instr/instr_private.h"
-#include "xbt/lib.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+
#include "surf/surf.h"
-#include "surf/surf_routing.h"
+
+#include "src/instr/instr_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
//Search for network_element_t
switch (kind){
case INSTR_HOST:
- newContainer->netcard = sg_host->pimpl_netcard;
- xbt_assert(newContainer->netcard, "Element '%s' not found",name);
+ newContainer->netpoint = sg_host->pimpl_netpoint;
+ xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
case INSTR_ROUTER:
- newContainer->netcard = static_cast<sg_netcard_t>(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL));
- xbt_assert(newContainer->netcard, "Element '%s' not found",name);
+ newContainer->netpoint = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name);
+ xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
case INSTR_AS:
- newContainer->netcard = static_cast<sg_netcard_t>(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL));
- xbt_assert(newContainer->netcard, "Element '%s' not found",name);
+ newContainer->netpoint = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name);
+ xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
break;
default:
- newContainer->netcard = nullptr;
+ newContainer->netpoint = nullptr;
break;
}