[trace] call functions that do the simix processes category registration directly

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

diff --git a/src/instr/instr_categories.c b/src/instr/instr_categories.c
index 4122102..aee6af8 100644 (file)
--- a/src/instr/instr_categories.c
+++ b/src/instr/instr_categories.c
@@ -45,10 +45,4 @@ void TRACE_category_unset(smx_process_t proc)
   }
 }
 
-void TRACE_msg_category_set(smx_process_t proc, m_task_t task)
-{
-  TRACE_category_set(proc, task->category);
-}
-
-
 #endif /* HAVE_TRACING */

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index 30f4d9b..af17a95 100644 (file)
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -156,7 +156,7 @@ void TRACE_msg_task_execute_start(m_task_t task)
   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)
@@ -245,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;
 }
 

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 42ef64a..8d64c79 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -70,7 +70,6 @@ void TRACE_category_release(void);
 void TRACE_category_set(smx_process_t proc, const char *category);
 char *TRACE_category_get(smx_process_t proc);
 void TRACE_category_unset(smx_process_t proc);
-void TRACE_msg_category_set(smx_process_t proc, m_task_t task);
 
 /* declaration of instrumentation functions from msg_task_instr.c */
 char *TRACE_task_container(m_task_t task, char *output, int len);