X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50e830ca114d788e390c130af09e00b66877784c..8a47028116925fea959f95bfe881618489658231:/src/instr/instr_msg_task.c

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index 3821012a9c..b75039ea12 100644
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -15,16 +15,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
  */
 void TRACE_msg_set_task_category(m_task_t task, const char *category)
 {
-  if (!TRACE_is_active())
+  if (!TRACE_categorized())
     return;
 
-  xbt_assert3(task->category == NULL, "Task %p(%s) already has a category (%s).",
+  xbt_assert(task->category == NULL, "Task %p(%s) already has a category (%s).",
       task, task->name, task->category);
   if (TRACE_msg_task_is_enabled()){
-    xbt_assert2(task->name != NULL,
+    xbt_assert(task->name != NULL,
         "Task %p(%s) must have a unique name in order to be traced, if --cfg=tracing/msg/task:1 is used.",
         task, task->name);
-    xbt_assert3(getContainer(task->name)==NULL,
+    xbt_assert(getContainer(task->name)==NULL,
         "Task %p(%s). Tracing already knows a task with name %s."
         "The name of each task must be unique, if --cfg=tracing/msg/task:1 is used.", task, task->name, task->name);
   }
@@ -38,24 +38,25 @@ void TRACE_msg_set_task_category(m_task_t task, const char *category)
 
   //set task category
   task->category = xbt_strdup (category);
-  DEBUG3("MSG task %p(%s), category %s", task, task->name, task->category);
+  XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
 
   if (TRACE_msg_task_is_enabled()){
     m_host_t host = MSG_host_self();
     container_t host_container = getContainer(host->name);
     //check to see if there is a container with the task->name
-    xbt_assert3(getContainer(task->name) == NULL,
+    xbt_assert(getContainer(task->name) == NULL,
         "Task %p(%s). Tracing already knows a task with name %s."
         "The name of each task must be unique, if --cfg=tracing/msg/task:1 is used.", task, task->name, task->name);
     container_t msg = newContainer(task->name, INSTR_MSG_TASK, host_container);
-    type_t type = getType (task->category);
+    type_t type = getType (task->category, msg->type);
     if (!type){
       type = getVariableType(task->category, NULL, msg->type);
     }
     new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
 
-    type = getType ("MSG_TASK_STATE");
-    new_pajePushState (MSG_get_clock(), msg, type, "created");
+    type = getType ("MSG_TASK_STATE", msg->type);
+    val_t value = getValueByName ("created", type);
+    new_pajePushState (MSG_get_clock(), msg, type, value);
   }
 }
 
@@ -65,18 +66,19 @@ void TRACE_msg_task_create(m_task_t task)
   static long long counter = 0;
   task->counter = counter++;
   task->category = NULL;
-  DEBUG2("CREATE %p, %lld", task, task->counter);
+  XBT_DEBUG("CREATE %p, %lld", task, task->counter);
 }
 
 /* MSG_task_execute related functions */
 void TRACE_msg_task_execute_start(m_task_t task)
 {
-  DEBUG3("EXEC,in %p, %lld, %s", task, task->counter, task->category);
+  XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
     container_t task_container = getContainer (task->name);
-    type_t type = getType ("MSG_TASK_STATE");
-    new_pajePushState (MSG_get_clock(), task_container, type, "MSG_task_execute");
+    type_t type = getType ("MSG_TASK_STATE", task_container->type);
+    val_t value = getValueByName ("MSG_task_execute", type);
+    new_pajePushState (MSG_get_clock(), task_container, type, value);
   }
 
   if (TRACE_msg_process_is_enabled()){
@@ -84,18 +86,19 @@ void TRACE_msg_task_execute_start(m_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(MSG_process_self(), str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
-    new_pajePushState (MSG_get_clock(), process_container, type, "task_execute");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = getValueByName ("task_execute", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
   }
 }
 
 void TRACE_msg_task_execute_end(m_task_t task)
 {
-  DEBUG3("EXEC,out %p, %lld, %s", task, task->counter, task->category);
+  XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
     container_t task_container = getContainer (task->name);
-    type_t type = getType ("MSG_TASK_STATE");
+    type_t type = getType ("MSG_TASK_STATE", task_container->type);
     new_pajePopState (MSG_get_clock(), task_container, type);
   }
 
@@ -104,7 +107,7 @@ void TRACE_msg_task_execute_end(m_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(MSG_process_self(), str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
     new_pajePopState (MSG_get_clock(), process_container, type);
   }
 }
@@ -112,7 +115,7 @@ void TRACE_msg_task_execute_end(m_task_t task)
 /* MSG_task_destroy related functions */
 void TRACE_msg_task_destroy(m_task_t task)
 {
-  DEBUG3("DESTROY %p, %lld, %s", task, task->counter, task->category);
+  XBT_DEBUG("DESTROY %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
     //that's the end, let's destroy it
@@ -128,7 +131,7 @@ void TRACE_msg_task_destroy(m_task_t task)
 /* MSG_task_get related functions */
 void TRACE_msg_task_get_start(void)
 {
-  DEBUG0("GET,in");
+  XBT_DEBUG("GET,in");
 
   if (TRACE_msg_task_is_enabled()){
     //task not received yet, nothing to do
@@ -139,32 +142,29 @@ void TRACE_msg_task_get_start(void)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(MSG_process_self(), str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
-    new_pajePushState (MSG_get_clock(), process_container, type, "receive");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = getValueByName ("receive", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
   }
 }
 
 void TRACE_msg_task_get_end(double start_time, m_task_t task)
 {
-  DEBUG3("GET,out %p, %lld, %s", task, task->counter, task->category);
+  XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
 
-    //FIXME
-    //if (TRACE_msg_volume_is_enabled()){
-    //  TRACE_msg_volume_end(task);
-    //}
-
     m_host_t host = MSG_host_self();
     container_t host_container = getContainer(host->name);
     container_t msg = newContainer(task->name, INSTR_MSG_TASK, host_container);
-    type_t type = getType (task->category);
+    type_t type = getType (task->category, msg->type);
     new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
 
-    type = getType ("MSG_TASK_STATE");
-    new_pajePushState (MSG_get_clock(), msg, type, "created");
+    type = getType ("MSG_TASK_STATE", msg->type);
+    val_t value = getValueByName ("created", type);
+    new_pajePushState (MSG_get_clock(), msg, type, value);
 
-    type = getType ("MSG_TASK_LINK");
+    type = getType ("MSG_TASK_LINK", getRootType());
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", task->counter);
     new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "SR", key);
@@ -175,12 +175,12 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(MSG_process_self(), str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
     new_pajePopState (MSG_get_clock(), process_container, type);
 
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
-    type = getType ("MSG_PROCESS_TASK_LINK");
+    type = getType ("MSG_PROCESS_TASK_LINK", getRootType());
     new_pajeEndLink(MSG_get_clock(), getRootContainer(), type, process_container, "SR", key);
   }
 }
@@ -188,25 +188,20 @@ 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)
 {
-  DEBUG3("PUT,in %p, %lld, %s", task, task->counter, task->category);
+  XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
 
   if (TRACE_msg_task_is_enabled()){
 
     container_t msg = getContainer (task->name);
-    type_t type = getType ("MSG_TASK_STATE");
+    type_t type = getType ("MSG_TASK_STATE", msg->type);
     new_pajePopState (MSG_get_clock(), msg, type);
 
-    type = getType ("MSG_TASK_LINK");
+    type = getType ("MSG_TASK_LINK", getRootType());
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", task->counter);
     new_pajeStartLink(MSG_get_clock(), getRootContainer(), type, msg, "SR", key);
 
     destroyContainer (msg);
-
-    //FIXME
-    //if (TRACE_msg_volume_is_enabled()){
-    //  TRACE_msg_volume_start(task);
-    //}
   }
 
   if (TRACE_msg_process_is_enabled()){
@@ -214,12 +209,13 @@ int TRACE_msg_task_put_start(m_task_t task)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(MSG_process_self(), str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
-    new_pajePushState (MSG_get_clock(), process_container, type, "send");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = getValueByName ("send", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
 
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
-    type = getType ("MSG_PROCESS_TASK_LINK");
+    type = getType ("MSG_PROCESS_TASK_LINK", getRootType());
     new_pajeStartLink(MSG_get_clock(), getRootContainer(), type, process_container, "SR", key);
   }
 
@@ -228,7 +224,7 @@ int TRACE_msg_task_put_start(m_task_t task)
 
 void TRACE_msg_task_put_end(void)
 {
-  DEBUG0("PUT,out");
+  XBT_DEBUG("PUT,out");
 
   if (TRACE_msg_task_is_enabled()){
     //task no longer exists here
@@ -239,7 +235,7 @@ void TRACE_msg_task_put_end(void)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(MSG_process_self(), str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
     new_pajePopState (MSG_get_clock(), process_container, type);
   }
 }