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
s4u: use size_t for payload size instead of int and double
[simgrid.git]
/
src
/
surf
/
instr_routing.cpp
diff --git
a/src/surf/instr_routing.cpp
b/src/surf/instr_routing.cpp
index
1dd0268
..
d6e4f93
100644
(file)
--- a/
src/surf/instr_routing.cpp
+++ b/
src/surf/instr_routing.cpp
@@
-132,11
+132,11
@@
static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t
XBT_DEBUG("Graph extraction disabled by user.");
return;
}
XBT_DEBUG("Graph extraction disabled by user.");
return;
}
- XBT_DEBUG("Graph extraction for NetZone = %s", netzone->name());
- if (not netzone->
c
hildren()->empty()) {
+ XBT_DEBUG("Graph extraction for NetZone = %s", netzone->
getC
name());
+ if (not netzone->
getC
hildren()->empty()) {
//bottom-up recursion
//bottom-up recursion
- for (auto nz_son : *netzone->
c
hildren()) {
- container_t child_container = static_cast<container_t>(xbt_dict_get(container->children, nz_son->name()));
+ for (auto nz_son : *netzone->
getC
hildren()) {
+ container_t child_container = static_cast<container_t>(xbt_dict_get(container->children, nz_son->
getC
name()));
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
@@
-165,7
+165,7
@@
static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t
*/
static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
{
*/
static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
{
- const char* id = netzone.name();
+ const char* id = netzone.
getC
name();
if (PJ_container_get_root() == nullptr){
PJ_container_alloc ();
if (PJ_container_get_root() == nullptr){
PJ_container_alloc ();
@@
-237,7
+237,7
@@
static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
static void sg_instr_new_host(simgrid::s4u::Host& host)
{
container_t father = currentContainer.back();
static void sg_instr_new_host(simgrid::s4u::Host& host)
{
container_t father = currentContainer.back();
- container_t container = PJ_container_new(host.
c
name(), INSTR_HOST, father);
+ container_t container = PJ_container_new(host.
getC
name(), INSTR_HOST, father);
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
type_t speed = PJ_type_get_or_null ("power", container->type);
if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
type_t speed = PJ_type_get_or_null ("power", container->type);
@@
-245,7
+245,7
@@
static void sg_instr_new_host(simgrid::s4u::Host& host)
speed = PJ_type_variable_new ("power", nullptr, container->type);
}
speed = PJ_type_variable_new ("power", nullptr, container->type);
}
- double current_speed_state = host.
s
peed();
+ double current_speed_state = host.
getS
peed();
new SetVariableEvent (0, container, speed, current_speed_state);
}
if (TRACE_uncategorized()){
new SetVariableEvent (0, container, speed, current_speed_state);
}
if (TRACE_uncategorized()){
@@
-310,7
+310,7
@@
static void instr_routing_parse_end_platform ()
currentContainer.clear();
xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
XBT_DEBUG ("Starting graph extraction.");
currentContainer.clear();
xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
XBT_DEBUG ("Starting graph extraction.");
- recursiveGraphExtraction(simgrid::s4u::Engine::
instance()->n
etRoot(), PJ_container_get_root(), filter);
+ recursiveGraphExtraction(simgrid::s4u::Engine::
getInstance()->getN
etRoot(), PJ_container_get_root(), filter);
XBT_DEBUG ("Graph extraction finished.");
xbt_dict_free(&filter);
platform_created = 1;
XBT_DEBUG ("Graph extraction finished.");
xbt_dict_free(&filter);
platform_created = 1;
@@
-429,10
+429,11
@@
int instr_platform_traced ()
static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone,
container_t container)
{
static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone,
container_t container)
{
- if (not netzone->
c
hildren()->empty()) {
+ if (not netzone->
getC
hildren()->empty()) {
//bottom-up recursion
//bottom-up recursion
- for (auto netzone_child : *netzone->children()) {
- container_t child_container = static_cast<container_t>(xbt_dict_get(container->children, netzone_child->name()));
+ for (auto netzone_child : *netzone->getChildren()) {
+ container_t child_container =
+ static_cast<container_t>(xbt_dict_get(container->children, netzone_child->getCname()));
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}
@@
-445,7
+446,8
@@
xbt_graph_t instr_routing_platform_graph ()
xbt_graph_t ret = xbt_graph_new_graph (0, nullptr);
xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
xbt_graph_t ret = xbt_graph_new_graph (0, nullptr);
xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
- recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root());
+ recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(),
+ PJ_container_get_root());
xbt_dict_free (&nodes);
xbt_dict_free (&edges);
return ret;
xbt_dict_free (&nodes);
xbt_dict_free (&edges);
return ret;