Remove unused call to MSG_process_sleep(1).

[simgrid.git] / src / instr / instr_config.c

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 08474b4..67c7d50 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -71,7 +71,7 @@ int TRACE_end()
 
   /* dump trace buffer */
   TRACE_last_timestamp_to_dump = surf_get_clock();
-  TRACE_paje_dump_buffer();
+  TRACE_paje_dump_buffer(1);
 
   /* destroy all data structures of tracing (and free) */
   destroyAllContainers();
@@ -115,7 +115,8 @@ int TRACE_is_configured(void)
 
 int TRACE_smpi_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) &&
+      TRACE_is_enabled();
 }
 
 int TRACE_smpi_is_grouped(void)
@@ -135,17 +136,20 @@ int TRACE_uncategorized (void)
 
 int TRACE_msg_task_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK) &&
+      TRACE_is_enabled();
 }
 
 int TRACE_msg_process_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS) &&
+      TRACE_is_enabled();
 }
 
 int TRACE_msg_volume_is_enabled(void)
 {
-  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME) &&
+      TRACE_is_enabled();
 }
 
 char *TRACE_get_filename(void)