From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Thu, 28 Apr 2011 14:15:19 +0000 (+0200)
Subject: [trace] smpi grouped trace implies user wants to trace smpi as a whole
X-Git-Tag: v3_6_rc3~14^2~19
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/82be869daaeebdc214422dc16ad61ba6380b0206?ds=inline

[trace] smpi grouped trace implies user wants to trace smpi as a whole
---

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 45e7aaf0ce..3e6ed76826 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -150,7 +150,9 @@ int TRACE_is_configured(void)
 
 int TRACE_smpi_is_enabled(void)
 {
-  return trace_smpi_enabled && TRACE_is_enabled();
+  return (xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) ||
+       TRACE_smpi_is_grouped())&&
+      TRACE_is_enabled();
 }
 
 int TRACE_smpi_is_grouped(void)