[trace] simpler verifications to see what is enabled before tracing

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

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index 99207bb..f263757 100644 (file)
--- a/src/instr/instr_smpi.c
+++ b/src/instr/instr_smpi.c
@@ -56,10 +56,7 @@ static xbt_dict_t process_category;
 
 void TRACE_internal_smpi_set_category (const char *category)
 {
-  if (!TRACE_is_active())
-    return;
-  if (!TRACE_smpi_is_enabled())
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   //declare category
   TRACE_category (category);
@@ -74,10 +71,7 @@ void TRACE_internal_smpi_set_category (const char *category)
 
 const char *TRACE_internal_smpi_get_category (void)
 {
-  if (!TRACE_is_active())
-    return NULL;
-  if (!TRACE_smpi_is_enabled())
-    return NULL;
+  if (!TRACE_smpi_is_enabled()) return NULL;
 
   char processid[INSTR_DEFAULT_STR_SIZE];
   snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
@@ -92,23 +86,22 @@ void TRACE_smpi_alloc()
 
 void TRACE_smpi_start(void)
 {
-  if (TRACE_is_enabled()) {
-    TRACE_start();
-  }
+  if (!TRACE_smpi_is_enabled()) return;
+
+  TRACE_start();
 }
 
 void TRACE_smpi_release(void)
 {
-  if (TRACE_is_enabled()) {
-    TRACE_surf_release();
-    TRACE_end();
-  }
+  if (!TRACE_smpi_is_enabled()) return;
+
+  TRACE_surf_release();
+  TRACE_end();
 }
 
 void TRACE_smpi_init(int rank)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -126,8 +119,7 @@ void TRACE_smpi_init(int rank)
 
 void TRACE_smpi_finalize(int rank)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -136,8 +128,7 @@ void TRACE_smpi_finalize(int rank)
 
 void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -149,8 +140,7 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 
 void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -162,8 +152,7 @@ void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 
 void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -175,8 +164,7 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -188,8 +176,7 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 
 void TRACE_smpi_send(int rank, int src, int dst)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char key[INSTR_DEFAULT_STR_SIZE];
   TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
@@ -204,8 +191,7 @@ void TRACE_smpi_send(int rank, int src, int dst)
 
 void TRACE_smpi_recv(int rank, int src, int dst)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char key[INSTR_DEFAULT_STR_SIZE];
   TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);