From 36b13d80aa850a3ce2ac8255f384ac79ec70fb6f Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 5 Jul 2016 18:34:03 +0200 Subject: [PATCH] grouped trace or not, MPI_LINK type should be tied to root. This caused issues with complex platforms with several level of AS (g5k.xml), and grouped tracing (several MPI_LINK types were created, causing an abort when trying to use one). --- src/surf/instr_routing.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index cd376b1351..c52abdad65 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -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()) { - 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); - PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); } } -- 2.20.1