[trace] do not rely on preprocessor constants to control what is traced (part 2)

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

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 9ec328c..7c4fce3 100644 (file)
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -108,7 +108,7 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
                                    m_host_t new_host)
 {
   char alias[200];
-  if (!(TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) || !IS_TRACED(process))
+  if (!(TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) || !process->category)
     return;
 
   //disabling presence in old_host (__TRACE_msg_process_not_present)
@@ -123,7 +123,7 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
 void TRACE_msg_process_kill(m_process_t process)
 {
   char name[200];
-  if (!TRACE_msg_process_is_enabled() || !IS_TRACED(process))
+  if (!TRACE_msg_process_is_enabled() || !process->category)
     return;
 
   TRACE_process_container(process, name, 200);
@@ -133,7 +133,7 @@ void TRACE_msg_process_kill(m_process_t process)
 void TRACE_msg_process_suspend(m_process_t process)
 {
   char name[200];
-  if (!TRACE_msg_process_is_enabled() || !IS_TRACED(process))
+  if (!TRACE_msg_process_is_enabled() || !process->category)
     return;
 
   TRACE_process_container(process, name, 200);
@@ -143,7 +143,7 @@ void TRACE_msg_process_suspend(m_process_t process)
 void TRACE_msg_process_resume(m_process_t process)
 {
   char name[200];
-  if (!TRACE_msg_process_is_enabled() || !IS_TRACED(process))
+  if (!TRACE_msg_process_is_enabled() || !process->category)
     return;
 
   TRACE_process_container(process, name, 200);
@@ -153,7 +153,7 @@ void TRACE_msg_process_resume(m_process_t process)
 void TRACE_msg_process_sleep_in(m_process_t process)
 {
   char name[200];
-  if (!TRACE_msg_process_is_enabled() || !IS_TRACED(process))
+  if (!TRACE_msg_process_is_enabled() || !process->category)
     return;
 
   TRACE_process_container(process, name, 200);
@@ -163,7 +163,7 @@ void TRACE_msg_process_sleep_in(m_process_t process)
 void TRACE_msg_process_sleep_out(m_process_t process)
 {
   char name[200];
-  if (!TRACE_msg_process_is_enabled() || !IS_TRACED(process))
+  if (!TRACE_msg_process_is_enabled() || !process->category)
     return;
 
   TRACE_process_container(process, name, 200);
@@ -174,7 +174,7 @@ void TRACE_msg_process_end(m_process_t process)
 {
   char name[200], alias[200];
   m_host_t host = NULL;
-  if (!IS_TRACED(process))
+  if (!!process->category)
     return;
 
   host = MSG_process_get_host(process);

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index ae92667..7238d8d 100644 (file)
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -147,7 +147,7 @@ void TRACE_msg_task_execute_start(m_task_t task)
   if (!TRACE_is_active())
     return;
 
-  if (!IS_TRACED(task))
+  if (!task->category)
     return;
 
   TRACE_task_container(task, name, 200);
@@ -163,7 +163,7 @@ void TRACE_msg_task_execute_end(m_task_t task)
   if (!TRACE_is_active())
     return;
 
-  if (!IS_TRACED(task))
+  if (!task->category)
     return;
 
   TRACE_task_container(task, name, 200);
@@ -180,7 +180,7 @@ void TRACE_msg_task_destroy(m_task_t task)
   if (!TRACE_is_active())
     return;
 
-  if (!IS_TRACED(task))
+  if (!task->category)
     return;
 
   TRACE_task_container(task, name, 200);
@@ -208,7 +208,7 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task)
   if (!TRACE_is_active())
     return;
 
-  if (!IS_TRACED(task))
+  if (!task->category)
     return;
 
   TRACE_task_container(task, name, 200);
@@ -228,7 +228,7 @@ int TRACE_msg_task_put_start(m_task_t task)
   if (!TRACE_is_active())
     return 0;
 
-  if (!IS_TRACED(task))
+  if (!task->category)
     return 0;
 
   TRACE_task_container(task, name, 200);

diff --git a/src/instr/instr_msg_volume.c b/src/instr/instr_msg_volume.c
index 44a451d..8067d86 100644 (file)
--- a/src/instr/instr_msg_volume.c
+++ b/src/instr/instr_msg_volume.c
@@ -19,12 +19,12 @@ void TRACE_msg_volume_start(m_task_t task)
     return;
 
   /* check if task is traced */
-  if (!IS_TRACED(task))
+  if (!task->category)
     return;
 
   /* check if process is traced */
   process = MSG_process_self();
-  if (!IS_TRACED(process))
+  if (!process->category)
     return;
 
   host = MSG_process_get_host(process);
@@ -48,12 +48,12 @@ void TRACE_msg_volume_finish(m_task_t task)
     return;
 
   /* check if task is traced */
-  if (!IS_TRACED(task))
+  if (!task->category)
     return;
 
   /* check if process is traced */
   process = MSG_process_self();
-  if (!IS_TRACED(process))
+  if (!process->category)
     return;
 
   host = MSG_process_get_host(process);

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 39a9363..494de70 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -11,8 +11,6 @@
 
 #ifdef HAVE_TRACING
 
-#define IS_TRACED(n)          (n->category)
-
 #define INSTR_DEFAULT_STR_SIZE 500
 
 #include "instr/instr.h"

diff --git a/src/instr/instr_resource_utilization.c b/src/instr/instr_resource_utilization.c
index 5f4ec1d..b18ea88 100644 (file)
--- a/src/instr/instr_resource_utilization.c
+++ b/src/instr/instr_resource_utilization.c
@@ -290,7 +290,7 @@ void TRACE_surf_link_set_utilization(void *link, smx_action_t smx_action,
   }
 
   //trace categorized utilization
-  if (!IS_TRACED(surf_action))
+  if (!surf_action->category)
     return;
   char type[100];
   snprintf(type, 100, "b%s", surf_action->category);
@@ -320,7 +320,7 @@ void TRACE_surf_host_set_utilization(const char *name,
   }
 
   //trace categorized utilization
-  if (!IS_TRACED(surf_action))
+  if (!surf_action->category)
     return;
   char type[100];
   snprintf(type, 100, "p%s", surf_action->category);