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

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index 9796fbcd20..0677d05e80 100644
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -10,14 +10,11 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
 
-xbt_dict_t tasks_created = NULL;
-
 /*
  * TRACE_msg_set_task_category: tracing interface function
  */
 void TRACE_msg_set_task_category(m_task_t task, const char *category)
 {
-  if (!tasks_created) tasks_created = xbt_dict_new();
   if (!TRACE_is_active())
     return;
 
@@ -47,21 +44,19 @@ void TRACE_msg_set_task_category(m_task_t task, const char *category)
     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
-    container_t msg = getContainer(task->name);
-    xbt_assert3(xbt_dict_get_or_null (tasks_created, task->name) == NULL,
+    xbt_assert3(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);
-    msg = newContainer(task->name, INSTR_MSG_TASK, host_container);
-    type_t type = getType (task->category);
+    container_t msg = newContainer(task->name, INSTR_MSG_TASK, host_container);
+    type_t type = getType (task->category, msg->type);
     if (!type){
-      type = newVariableType(task->category, TYPE_VARIABLE, NULL, msg->type);
+      type = getVariableType(task->category, NULL, msg->type);
     }
-    pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");
-
-    type = getType ("MSG_TASK_STATE");
-    pajePushState (MSG_get_clock(), type->id, msg->id, "created");
+    new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
 
-    xbt_dict_set (tasks_created, task->name, xbt_strdup("1"), xbt_free);
+    type = getType ("MSG_TASK_STATE", msg->type);
+    val_t value = getValueByName ("created", type);
+    new_pajePushState (MSG_get_clock(), msg, type, value);
   }
 }
 
@@ -77,122 +72,182 @@ void TRACE_msg_task_create(m_task_t task)
 /* MSG_task_execute related functions */
 void TRACE_msg_task_execute_start(m_task_t task)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled() &&
-      task->category)) return;
-
   DEBUG3("EXEC,in %p, %lld, %s", task, task->counter, task->category);
 
-  container_t task_container = getContainer (task->name);
-  type_t type = getType ("MSG_TASK_STATE");
-  pajePushState (MSG_get_clock(), type->id, task_container->id, "MSG_task_execute");
+  if (TRACE_msg_task_is_enabled()){
+    container_t task_container = getContainer (task->name);
+    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()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    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", 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)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled() &&
-      task->category)) return;
-
   DEBUG3("EXEC,out %p, %lld, %s", task, task->counter, task->category);
 
-  container_t task_container = getContainer (task->name);
-  type_t type = getType ("MSG_TASK_STATE");
-  pajePopState (MSG_get_clock(), type->id, task_container->id);
+  if (TRACE_msg_task_is_enabled()){
+    container_t task_container = getContainer (task->name);
+    type_t type = getType ("MSG_TASK_STATE", task_container->type);
+    new_pajePopState (MSG_get_clock(), task_container, type);
+  }
+
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    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", process_container->type);
+    new_pajePopState (MSG_get_clock(), process_container, type);
+  }
 }
 
 /* MSG_task_destroy related functions */
 void TRACE_msg_task_destroy(m_task_t task)
 {
-  if (!tasks_created) tasks_created = xbt_dict_new();
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled() &&
-      task->category)) return;
-
-  //that's the end, let's destroy it
-  destroyContainer (getContainer(task->name));
-
   DEBUG3("DESTROY %p, %lld, %s", task, task->counter, task->category);
 
+  if (TRACE_msg_task_is_enabled()){
+    //that's the end, let's destroy it
+    destroyContainer (getContainer(task->name));
+  }
+
   //free category
   xbt_free(task->category);
   task->category = NULL;
-
-  xbt_dict_remove (tasks_created, task->name);
   return;
 }
 
 /* MSG_task_get related functions */
 void TRACE_msg_task_get_start(void)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled())) return;
-
   DEBUG0("GET,in");
+
+  if (TRACE_msg_task_is_enabled()){
+    //task not received yet, nothing to do
+  }
+
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    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", 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)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled() &&
-      task->category)) return;
-
   DEBUG3("GET,out %p, %lld, %s", task, task->counter, task->category);
 
-  //FIXME
-  //if (TRACE_msg_volume_is_enabled()){
-  //  TRACE_msg_volume_end(task);
-  //}
+  if (TRACE_msg_task_is_enabled()){
 
-  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);
-  pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");
+    //FIXME
+    //if (TRACE_msg_volume_is_enabled()){
+    //  TRACE_msg_volume_end(task);
+    //}
 
-  type = getType ("MSG_TASK_STATE");
-  pajePushState (MSG_get_clock(), type->id, msg->id, "created");
+    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, msg->type);
+    new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
+
+    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", 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);
+  }
 
-  type = getType ("MSG_TASK_LINK");
-  char key[INSTR_DEFAULT_STR_SIZE];
-  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", task->counter);
-  pajeEndLink(MSG_get_clock(), type->id, "0", "SR", msg->id, key);
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    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", 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", getRootType());
+    new_pajeEndLink(MSG_get_clock(), getRootContainer(), type, process_container, "SR", key);
+  }
 }
 
 /* MSG_task_put related functions */
 int TRACE_msg_task_put_start(m_task_t task)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled() &&
-      task->category)) return 0;
-
   DEBUG3("PUT,in %p, %lld, %s", task, task->counter, task->category);
 
-  container_t msg = getContainer (task->name);
-  type_t type = getType ("MSG_TASK_STATE");
-  pajePopState (MSG_get_clock(), type->id, msg->id);
+  if (TRACE_msg_task_is_enabled()){
 
-  type = getType ("MSG_TASK_LINK");
-  char key[INSTR_DEFAULT_STR_SIZE];
-  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", task->counter);
-  pajeStartLink(MSG_get_clock(), type->id, "0", "SR", msg->id, key);
+    container_t msg = getContainer (task->name);
+    type_t type = getType ("MSG_TASK_STATE", msg->type);
+    new_pajePopState (MSG_get_clock(), msg, type);
 
-  destroyContainer (msg);
+    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);
 
-  //FIXME
-  //if (TRACE_msg_volume_is_enabled()){
-  //  TRACE_msg_volume_start(task);
-  //}
+    destroyContainer (msg);
+
+    //FIXME
+    //if (TRACE_msg_volume_is_enabled()){
+    //  TRACE_msg_volume_start(task);
+    //}
+  }
+
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    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", 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", getRootType());
+    new_pajeStartLink(MSG_get_clock(), getRootContainer(), type, process_container, "SR", key);
+  }
 
   return 1;
 }
 
 void TRACE_msg_task_put_end(void)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_task_is_enabled())) return;
-
   DEBUG0("PUT,out");
+
+  if (TRACE_msg_task_is_enabled()){
+    //task no longer exists here
+  }
+
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    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", process_container->type);
+    new_pajePopState (MSG_get_clock(), process_container, type);
+  }
 }
 
 #endif /* HAVE_TRACING */