[trace] removing the tracing per task (where each task was a container)

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

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index b75039e..423eab3 100644 (file)
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -15,49 +15,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
  */
 void TRACE_msg_set_task_category(m_task_t task, const char *category)
 {
-  if (!TRACE_categorized())
-    return;
-
   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_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_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);
-  }
 
+  //if user provides a NULL category, task is no longer traced
   if (category == NULL) {
-    //if user provides a NULL category, task is no longer traced
     xbt_free (task->category);
     task->category = NULL;
+    XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
     return;
   }
 
   //set task category
   task->category = xbt_strdup (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_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, msg->type);
-    if (!type){
-      type = getVariableType(task->category, NULL, 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);
-  }
 }
 
 /* MSG_task_create related function*/
@@ -74,13 +45,6 @@ void TRACE_msg_task_execute_start(m_task_t task)
 {
   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", 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];
@@ -96,12 +60,6 @@ void TRACE_msg_task_execute_end(m_task_t task)
 {
   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", 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];
@@ -117,11 +75,6 @@ void TRACE_msg_task_destroy(m_task_t task)
 {
   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
-    destroyContainer (getContainer(task->name));
-  }
-
   //free category
   xbt_free(task->category);
   task->category = NULL;
@@ -133,10 +86,6 @@ void TRACE_msg_task_get_start(void)
 {
   XBT_DEBUG("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];
@@ -152,24 +101,6 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task)
 {
   XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
 
-  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, 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);
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -190,20 +121,6 @@ int TRACE_msg_task_put_start(m_task_t task)
 {
   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", msg->type);
-    new_pajePopState (MSG_get_clock(), msg, type);
-
-    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);
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -226,10 +143,6 @@ void TRACE_msg_task_put_end(void)
 {
   XBT_DEBUG("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];