grouped trace or not, MPI_LINK type should be tied to root.

[simgrid.git] / src / surf / instr_routing.cpp

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 76fb677..c52abda 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -152,7 +152,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe
     xbt_dict_cursor_t cursor = nullptr;
     char *edge_name;
 
     xbt_dict_cursor_t cursor = nullptr;
     char *edge_name;
 

-    static_cast<simgrid::surf::AsImpl*>(as)->getGraph(graph, nodes, edges);
+    static_cast<simgrid::routing::AsImpl*>(as)->getGraph(graph, nodes, edges);

     xbt_dict_foreach(edges,cursor,edge_name,edge) {
         linkContainers(
           PJ_container_get((const char*) edge->src->data),
     xbt_dict_foreach(edges,cursor,edge_name,edge) {
         linkContainers(
           PJ_container_get((const char*) edge->src->data),


@@ -178,13 +178,11 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS)
     PJ_container_set_root (root);
 
     if (TRACE_smpi_is_enabled()) {
     PJ_container_set_root (root);
 
     if (TRACE_smpi_is_enabled()) {

-      if (!TRACE_smpi_is_grouped()){
-        type_t mpi = PJ_type_get_or_null ("MPI", root->type);
-        if (mpi == nullptr){
-          mpi = PJ_type_container_new("MPI", root->type);
-          PJ_type_state_new ("MPI_STATE", mpi);
-          PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);
-        }
+      type_t mpi = PJ_type_get_or_null ("MPI", root->type);
+      if (mpi == nullptr){
+        mpi = PJ_type_container_new("MPI", root->type);
+        if (!TRACE_smpi_is_grouped()) PJ_type_state_new ("MPI_STATE", mpi);
+        PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);

       }
     }
 
       }
     }
 


@@ -284,7 +282,6 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host)
     if (mpi == nullptr){
       mpi = PJ_type_container_new("MPI", container->type);
       PJ_type_state_new ("MPI_STATE", mpi);
     if (mpi == nullptr){
       mpi = PJ_type_container_new("MPI", container->type);
       PJ_type_state_new ("MPI_STATE", mpi);

-      PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);

     }
   }
 
     }
   }
 


@@ -459,7 +456,7 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb
     }
   }
 
     }
   }
 

-  static_cast<simgrid::surf::AsImpl*>(as)->getGraph(graph, nodes, edges);
+  static_cast<simgrid::routing::AsImpl*>(as)->getGraph(graph, nodes, edges);

 }
 
 xbt_graph_t instr_routing_platform_graph (void)
 }
 
 xbt_graph_t instr_routing_platform_graph (void)