cosmetics on tracing mechanism

[simgrid.git] / src / instr / msg_task_instr.c

diff --git a/src/instr/msg_task_instr.c b/src/instr/msg_task_instr.c
index adfbc59..ad1f3d2 100644 (file)
--- a/src/instr/msg_task_instr.c
+++ b/src/instr/msg_task_instr.c
@@ -9,38 +9,18 @@
 #ifdef HAVE_TRACING
 
 static xbt_dict_t task_containers = NULL;
-static xbt_dict_t current_task_category = NULL;
 
-void __TRACE_msg_init (void)
+void TRACE_msg_task_alloc (void)
 {
-  current_task_category = xbt_dict_new();
   task_containers = xbt_dict_new();
 }
 
-void __TRACE_current_category_set (m_task_t task)
+void TRACE_msg_task_release (void)
 {
-  char processid[100];
-  char *var_cpy = NULL;
-  snprintf (processid, 100, "%p", SIMIX_process_self());
-  var_cpy = xbt_strdup (task->category);
-  xbt_dict_set (current_task_category, processid, var_cpy, xbt_free);
+  xbt_dict_free (&task_containers);
 }
 
-void __TRACE_current_category_unset ()
-{
-  char processid[100];
-  snprintf (processid, 100, "%p", SIMIX_process_self());
-  xbt_dict_remove (current_task_category, processid);
-}
-
-char *__TRACE_current_category_get (smx_process_t proc)
-{
-  char processid[100];
-  snprintf (processid, 100, "%p", proc);
-  return xbt_dict_get_or_null (current_task_category, processid);
-}
-
-void __TRACE_task_location (m_task_t task)
+static void TRACE_task_location (m_task_t task)
 {
        char container[200];
        char name[200], alias[200];
@@ -64,7 +44,7 @@ void __TRACE_task_location (m_task_t task)
   }
 }
 
-void __TRACE_task_location_present (m_task_t task)
+static void TRACE_task_location_present (m_task_t task)
 {
        char alias[200];
        m_process_t process = NULL;
@@ -78,7 +58,7 @@ void __TRACE_task_location_present (m_task_t task)
   pajePushState (MSG_get_clock(), "presence", alias, "presence");
 }
 
-void __TRACE_task_location_not_present (m_task_t task)
+static void TRACE_task_location_not_present (m_task_t task)
 {
        char alias[200];
        m_process_t process = NULL;
@@ -105,8 +85,8 @@ void TRACE_msg_set_task_category(m_task_t task, const char *category)
   strncpy(task->category, category, strlen(category)+1);
 
   //tracing task location based on host
-  __TRACE_task_location (task);
-  __TRACE_task_location_present (task);
+  TRACE_task_location (task);
+  TRACE_task_location_present (task);
 
   TRACE_task_container (task, name, 200);
   //create container of type "task" to indicate behavior
@@ -131,7 +111,7 @@ void TRACE_msg_task_execute_start (m_task_t task)
   TRACE_task_container (task, name, 200);
   if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "execute");
 
-  __TRACE_current_category_set (task);
+  TRACE_msg_category_set (SIMIX_process_self(), task);
 }
 
 void TRACE_msg_task_execute_end (m_task_t task)
@@ -142,7 +122,7 @@ void TRACE_msg_task_execute_end (m_task_t task)
   TRACE_task_container (task, name, 200);
   if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
 
-  __TRACE_current_category_unset();
+  TRACE_category_unset(SIMIX_process_self());
 }
 
 /* MSG_task_destroy related functions */
@@ -155,7 +135,7 @@ void TRACE_msg_task_destroy (m_task_t task)
   if (IS_TRACING_TASKS) pajeDestroyContainer (MSG_get_clock(), "task", name);
 
   //finish the location of this task
-  __TRACE_task_location_not_present (task);
+  TRACE_task_location_not_present (task);
 
   //free category
   xbt_free (task->category);
@@ -176,10 +156,10 @@ void TRACE_msg_task_get_end (double start_time, m_task_t task)
   TRACE_task_container (task, name, 200);
   if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
 
-  __TRACE_msg_volume_finish (task);
+  TRACE_msg_volume_finish (task);
 
-  __TRACE_task_location (task);
-  __TRACE_task_location_present (task);
+  TRACE_task_location (task);
+  TRACE_task_location_present (task);
 }
 
 /* MSG_task_put related functions */
@@ -192,13 +172,13 @@ int TRACE_msg_task_put_start (m_task_t task)
   if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
   if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "communicate");
 
-  __TRACE_msg_volume_start (task);
+  TRACE_msg_volume_start (task);
 
   //trace task location grouped by host
-  __TRACE_task_location_not_present (task);
+  TRACE_task_location_not_present (task);
 
   //set current category
-  __TRACE_current_category_set (task);
+  TRACE_msg_category_set (SIMIX_process_self(), task);
   return 1;
 }
 
@@ -206,7 +186,7 @@ void TRACE_msg_task_put_end (void)
 {
   if (!IS_TRACING) return;
 
-  __TRACE_current_category_unset ();
+  TRACE_category_unset (SIMIX_process_self());
 }
 
 #endif