A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netcards were renamed to netpoints recently
[simgrid.git]
/
src
/
instr
/
instr_paje_containers.cpp
diff --git
a/src/instr/instr_paje_containers.cpp
b/src/instr/instr_paje_containers.cpp
index
8dfd00c
..
f172f91
100644
(file)
--- 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. */
/* 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 <xbt/dict.h>
+#include <xbt/lib.h>
+#include <xbt/log.h>
+
+#include <surf/surf.h>
+#include <surf/surf_routing.h>
+
#include "src/instr/instr_private.h"
#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)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
@@
-61,15
+68,15
@@
container_t PJ_container_new (const char *name, e_container_types kind, containe
//Search for network_element_t
switch (kind){
case INSTR_HOST:
//Search for network_element_t
switch (kind){
case INSTR_HOST:
- newContainer->netcard = sg_host->pimpl_net
card
;
+ newContainer->netcard = sg_host->pimpl_net
point
;
xbt_assert(newContainer->netcard, "Element '%s' not found",name);
break;
case INSTR_ROUTER:
xbt_assert(newContainer->netcard, "Element '%s' not found",name);
break;
case INSTR_ROUTER:
- newContainer->netcard = s
tatic_cast<sg_netcard_t>(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL)
);
+ newContainer->netcard = s
imgrid::s4u::Engine::instance()->netpointByNameOrNull(name
);
xbt_assert(newContainer->netcard, "Element '%s' not found",name);
break;
case INSTR_AS:
xbt_assert(newContainer->netcard, "Element '%s' not found",name);
break;
case INSTR_AS:
- newContainer->netcard = s
tatic_cast<sg_netcard_t>(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL)
);
+ newContainer->netcard = s
imgrid::s4u::Engine::instance()->netpointByNameOrNull(name
);
xbt_assert(newContainer->netcard, "Element '%s' not found",name);
break;
default:
xbt_assert(newContainer->netcard, "Element '%s' not found",name);
break;
default: