Remove remaining references to static version of libraries.

[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 10f95ab..09e217a 100644 (file)
--- a/src/instr/msg_task_instr.c
+++ b/src/instr/msg_task_instr.c
@@ -9,80 +9,70 @@
 #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];
-  snprintf (processid, 100, "%p", SIMIX_process_self());
-  char *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 ()
+static void TRACE_task_location(m_task_t task)
 {
-  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)
-{
-  if (!IS_TRACING_TASKS) return;
   char container[200];
-  m_process_t process = MSG_process_self();
-  m_host_t host = MSG_process_get_host (process);
+  char name[200], alias[200];
+  char *val_one = NULL;
+  m_process_t process = NULL;
+  m_host_t host = NULL;
+  if (!IS_TRACING_TASKS)
+    return;
+  process = MSG_process_self();
+  host = MSG_process_get_host(process);
 
   //tasks are grouped by host
-  TRACE_host_container (host, container, 200);
-
-  char name[200], alias[200];
-  TRACE_task_container (task, name, 200);
-  TRACE_task_alias_container (task, process, host, alias, 200);
+  TRACE_host_container(host, container, 200);
+  TRACE_task_container(task, name, 200);
+  TRACE_task_alias_container(task, process, host, alias, 200);
   //check if task container is already created
-  if (!xbt_dict_get_or_null (task_containers, alias)){
-    pajeCreateContainer (MSG_get_clock(), alias, "TASK", container, name);
-    pajeSetState (MSG_get_clock(), "category", alias, task->category);
-    char *val_one = xbt_strdup ("1");
-    xbt_dict_set (task_containers, alias, val_one, xbt_free);
+  if (!xbt_dict_get_or_null(task_containers, alias)) {
+    pajeCreateContainer(MSG_get_clock(), alias, "TASK", container, name);
+    pajeSetState(MSG_get_clock(), "category", alias, task->category);
+    val_one = xbt_strdup("1");
+    xbt_dict_set(task_containers, alias, val_one, xbt_free);
   }
 }
 
-void __TRACE_task_location_present (m_task_t task)
+static void TRACE_task_location_present(m_task_t task)
 {
-  if (!IS_TRACING_TASKS) return;
+  char alias[200];
+  m_process_t process = NULL;
+  m_host_t host = NULL;
+  if (!IS_TRACING_TASKS)
+    return;
   //updating presence state of this task location
-  m_process_t process = MSG_process_self();
-  m_host_t host = MSG_process_get_host (process);
+  process = MSG_process_self();
+  host = MSG_process_get_host(process);
 
-  char alias[200];
-  TRACE_task_alias_container (task, process, host, alias, 200);
-  pajePushState (MSG_get_clock(), "presence", alias, "presence");
+  TRACE_task_alias_container(task, process, host, alias, 200);
+  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)
 {
-  if (!IS_TRACING_TASKS) return;
+  char alias[200];
+  m_process_t process = NULL;
+  m_host_t host = NULL;
+  if (!IS_TRACING_TASKS)
+    return;
   //updating presence state of this task location
-  m_process_t process = MSG_process_self();
-  m_host_t host = MSG_process_get_host (process);
+  process = MSG_process_self();
+  host = MSG_process_get_host(process);
 
-  char alias[200];
-  TRACE_task_alias_container (task, process, host, alias, 200);
-  pajePopState (MSG_get_clock(), "presence", alias);
+  TRACE_task_alias_container(task, process, host, alias, 200);
+  pajePopState(MSG_get_clock(), "presence", alias);
 }
 
 /*
@@ -90,25 +80,28 @@ void __TRACE_task_location_not_present (m_task_t task)
  */
 void TRACE_msg_set_task_category(m_task_t task, const char *category)
 {
-  if (!IS_TRACING) return;
+  char name[200];
+  if (!IS_TRACING)
+    return;
 
   //set task category
-  task->category = xbt_new (char, strlen (category)+1);
-  strncpy(task->category, category, strlen(category)+1);
+  task->category = xbt_new(char, strlen(category) + 1);
+  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);
 
-  char name[200];
-  TRACE_task_container (task, name, 200);
+  TRACE_task_container(task, name, 200);
   //create container of type "task" to indicate behavior
-  if (IS_TRACING_TASKS) pajeCreateContainer (MSG_get_clock(), name, "task", category, name);
-  if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "created");
+  if (IS_TRACING_TASKS)
+    pajeCreateContainer(MSG_get_clock(), name, "task", category, name);
+  if (IS_TRACING_TASKS)
+    pajePushState(MSG_get_clock(), "task-state", name, "created");
 }
 
 /* MSG_task_create related function*/
-void TRACE_msg_task_create (m_task_t task)
+void TRACE_msg_task_create(m_task_t task)
 {
   static long long counter = 0;
   task->counter = counter++;
@@ -116,90 +109,103 @@ void TRACE_msg_task_create (m_task_t task)
 }
 
 /* MSG_task_execute related functions */
-void TRACE_msg_task_execute_start (m_task_t task)
+void TRACE_msg_task_execute_start(m_task_t task)
 {
-  if (!IS_TRACING || !IS_TRACED(task)) return;
-
   char name[200];
-  TRACE_task_container (task, name, 200);
-  if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "execute");
+  if (!IS_TRACING || !IS_TRACED(task))
+    return;
 
-  __TRACE_current_category_set (task);
+  TRACE_task_container(task, name, 200);
+  if (IS_TRACING_TASKS)
+    pajePushState(MSG_get_clock(), "task-state", name, "execute");
+
+  TRACE_msg_category_set(SIMIX_process_self(), task);
 }
 
-void TRACE_msg_task_execute_end (m_task_t task)
+void TRACE_msg_task_execute_end(m_task_t task)
 {
-  if (!IS_TRACING || !IS_TRACED(task)) return;
-
   char name[200];
-  TRACE_task_container (task, name, 200);
-  if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
+  if (!IS_TRACING || !IS_TRACED(task))
+    return;
+
+  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 */
-void TRACE_msg_task_destroy (m_task_t task)
+void TRACE_msg_task_destroy(m_task_t task)
 {
-  if (!IS_TRACING || !IS_TRACED(task)) return;
-
   char name[200];
-  TRACE_task_container (task, name, 200);
-  if (IS_TRACING_TASKS) pajeDestroyContainer (MSG_get_clock(), "task", name);
+  if (!IS_TRACING || !IS_TRACED(task))
+    return;
+
+  TRACE_task_container(task, name, 200);
+  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);
+  xbt_free(task->category);
   return;
 }
 
 /* MSG_task_get related functions */
-void TRACE_msg_task_get_start (void)
+void TRACE_msg_task_get_start(void)
 {
-  if (!IS_TRACING) return;
+  if (!IS_TRACING)
+    return;
 }
 
-void TRACE_msg_task_get_end (double start_time, m_task_t task)
+void TRACE_msg_task_get_end(double start_time, m_task_t task)
 {
-  if (!IS_TRACING || !IS_TRACED(task)) return;
-
   char name[200];
-  TRACE_task_container (task, name, 200);
-  if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
+  if (!IS_TRACING || !IS_TRACED(task))
+    return;
 
-  __TRACE_msg_volume_finish (task);
+  TRACE_task_container(task, name, 200);
+  if (IS_TRACING_TASKS)
+    pajePopState(MSG_get_clock(), "task-state", name);
 
-  __TRACE_task_location (task);
-  __TRACE_task_location_present (task);
+  TRACE_msg_volume_finish(task);
+
+  TRACE_task_location(task);
+  TRACE_task_location_present(task);
 }
 
 /* MSG_task_put related functions */
-int TRACE_msg_task_put_start (m_task_t task)
+int TRACE_msg_task_put_start(m_task_t task)
 {
-  if (!IS_TRACING || !IS_TRACED(task)) return 0;
-
   char name[200];
-  TRACE_task_container (task, name, 200);
-  if (IS_TRACING_TASKS) pajePopState (MSG_get_clock(), "task-state", name);
-  if (IS_TRACING_TASKS) pajePushState (MSG_get_clock(), "task-state", name, "communicate");
+  if (!IS_TRACING || !IS_TRACED(task))
+    return 0;
+
+  TRACE_task_container(task, name, 200);
+  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;
 }
 
-void TRACE_msg_task_put_end (void)
+void TRACE_msg_task_put_end(void)
 {
-  if (!IS_TRACING) return;
+  if (!IS_TRACING)
+    return;
 
-  __TRACE_current_category_unset ();
+  TRACE_category_unset(SIMIX_process_self());
 }
 
 #endif