[trace] categories are only used for characterized resource utilization tracing

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

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index 8a8a659..3821012 100644 (file)
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -71,8 +71,6 @@ void TRACE_msg_task_create(m_task_t task)
 /* MSG_task_execute related functions */
 void TRACE_msg_task_execute_start(m_task_t task)
 {
-  if (!task->category) return;
-
   DEBUG3("EXEC,in %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
@@ -93,8 +91,6 @@ void TRACE_msg_task_execute_start(m_task_t task)
 
 void TRACE_msg_task_execute_end(m_task_t task)
 {
-  if (!task->category) return;
-
   DEBUG3("EXEC,out %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
@@ -116,14 +112,13 @@ void TRACE_msg_task_execute_end(m_task_t task)
 /* MSG_task_destroy related functions */
 void TRACE_msg_task_destroy(m_task_t task)
 {
-  if (!(TRACE_msg_task_is_enabled() &&
-        task->category)) return;
-
-  //that's the end, let's destroy it
-  destroyContainer (getContainer(task->name));
-
   DEBUG3("DESTROY %p, %lld, %s", task, task->counter, task->category);
 
+  if (TRACE_msg_task_is_enabled()){
+    //that's the end, let's destroy it
+    destroyContainer (getContainer(task->name));
+  }
+
   //free category
   xbt_free(task->category);
   task->category = NULL;
@@ -151,8 +146,6 @@ void TRACE_msg_task_get_start(void)
 
 void TRACE_msg_task_get_end(double start_time, m_task_t task)
 {
-  if (!task->category) return;
-
   DEBUG3("GET,out %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
@@ -195,8 +188,6 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task)
 /* MSG_task_put related functions */
 int TRACE_msg_task_put_start(m_task_t task)
 {
-  if (!task->category) return 0;
-
   DEBUG3("PUT,in %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){