From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 3 Dec 2010 10:40:17 +0000 (+0000)
Subject: [trace] separate TRACE_is_active() from IS_TRACED condition
X-Git-Tag: v3.6_beta2~948
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5347eea65c391c8c4c5839ce207f34abf0eed9f4

[trace] separate TRACE_is_active() from IS_TRACED condition

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8974 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index bd35dabd50..5dc61c3d21 100644
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -144,7 +144,10 @@ void TRACE_msg_task_create(m_task_t task)
 void TRACE_msg_task_execute_start(m_task_t task)
 {
   char name[200];
-  if (!TRACE_is_active() || !IS_TRACED(task))
+  if (!TRACE_is_active())
+    return;
+
+  if (!IS_TRACED(task))
     return;
 
   TRACE_task_container(task, name, 200);
@@ -157,7 +160,10 @@ void TRACE_msg_task_execute_start(m_task_t task)
 void TRACE_msg_task_execute_end(m_task_t task)
 {
   char name[200];
-  if (!TRACE_is_active() || !IS_TRACED(task))
+  if (!TRACE_is_active())
+    return;
+
+  if (!IS_TRACED(task))
     return;
 
   TRACE_task_container(task, name, 200);
@@ -171,7 +177,10 @@ void TRACE_msg_task_execute_end(m_task_t task)
 void TRACE_msg_task_destroy(m_task_t task)
 {
   char name[200];
-  if (!TRACE_is_active() || !IS_TRACED(task))
+  if (!TRACE_is_active())
+    return;
+
+  if (!IS_TRACED(task))
     return;
 
   TRACE_task_container(task, name, 200);
@@ -196,7 +205,10 @@ void TRACE_msg_task_get_start(void)
 void TRACE_msg_task_get_end(double start_time, m_task_t task)
 {
   char name[200];
-  if (!TRACE_is_active() || !IS_TRACED(task))
+  if (!TRACE_is_active())
+    return;
+
+  if (!IS_TRACED(task))
     return;
 
   TRACE_task_container(task, name, 200);
@@ -213,7 +225,10 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task)
 int TRACE_msg_task_put_start(m_task_t task)
 {
   char name[200];
-  if (!TRACE_is_active() || !IS_TRACED(task))
+  if (!TRACE_is_active())
+    return 0;
+
+  if (!IS_TRACED(task))
     return 0;
 
   TRACE_task_container(task, name, 200);