X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24a9a43343e8bb1e6ae073d8a480de24ffcf4d2f..e858b2e4c1677fa20cc4cb25b8a4e5e874ef617a:/src/instr/instr_msg_task.c

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index ae926675e0..af17a953fa 100644
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -8,6 +8,8 @@
 
 #ifdef HAVE_TRACING
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
+
 static xbt_dict_t task_containers = NULL;
 
 static char *TRACE_task_alias_container(m_task_t task, m_process_t process,
@@ -147,14 +149,14 @@ 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);
   if (TRACE_msg_task_is_enabled())
     pajePushState(MSG_get_clock(), "task-state", name, "execute");
 
-  TRACE_msg_category_set(SIMIX_process_self(), task);
+  TRACE_category_set(SIMIX_process_self(), task->category);
 }
 
 void TRACE_msg_task_execute_end(m_task_t task)
@@ -163,7 +165,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 +182,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 +210,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 +230,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);
@@ -243,7 +245,7 @@ int TRACE_msg_task_put_start(m_task_t task)
   TRACE_task_location_not_present(task);
 
   //set current category
-  TRACE_msg_category_set(SIMIX_process_self(), task);
+  TRACE_category_set(SIMIX_process_self(), task->category);
   return 1;
 }