#ifdef HAVE_TRACING
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
+
static xbt_dict_t task_containers = NULL;
static char *TRACE_task_alias_container(m_task_t task, m_process_t process,
char *val_one = NULL;
m_process_t process = NULL;
m_host_t host = NULL;
- if (!IS_TRACING_TASKS)
+ if (!TRACE_msg_task_is_enabled())
return;
process = MSG_process_self();
host = MSG_process_get_host(process);
char alias[200];
m_process_t process = NULL;
m_host_t host = NULL;
- if (!IS_TRACING_TASKS)
+ if (!TRACE_msg_task_is_enabled())
return;
//updating presence state of this task location
process = MSG_process_self();
char alias[200];
m_process_t process = NULL;
m_host_t host = NULL;
- if (!IS_TRACING_TASKS)
+ if (!TRACE_msg_task_is_enabled())
return;
//updating presence state of this task location
process = MSG_process_self();
if (!TRACE_is_active())
return;
+ xbt_assert3(task->category == NULL, "Task %p(%s) already has a category (%s).",
+ task, task->name, task->category);
+
//set task category
- task->category = xbt_new(char, strlen(category) + 1);
- strncpy(task->category, category, strlen(category) + 1);
+ task->category = xbt_strdup (category);
+ DEBUG3("MSG task %p(%s), category %s", task, task->name, task->category);
//tracing task location based on host
TRACE_task_location(task);
TRACE_task_container(task, name, 200);
//create container of type "task" to indicate behavior
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajeCreateContainer(MSG_get_clock(), name, "task", category, name);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajePushState(MSG_get_clock(), "task-state", name, "created");
}
static long long counter = 0;
task->counter = counter++;
task->category = NULL;
+ DEBUG2("CREATE %p, %lld", task, task->counter);
}
/* MSG_task_execute related functions */
if (!TRACE_is_active())
return;
- if (!IS_TRACED(task))
+ if (!task->category)
return;
+ DEBUG3("EXEC,in %p, %lld, %s", task, task->counter, task->category);
+
TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
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)
if (!TRACE_is_active())
return;
- if (!IS_TRACED(task))
+ if (!task->category)
return;
TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajePopState(MSG_get_clock(), "task-state", name);
- TRACE_category_unset(SIMIX_process_self());
+ DEBUG3("EXEC,out %p, %lld, %s", task, task->counter, task->category);
}
/* MSG_task_destroy related functions */
if (!TRACE_is_active())
return;
- if (!IS_TRACED(task))
+ if (!task->category)
return;
TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajeDestroyContainer(MSG_get_clock(), "task", name);
//finish the location of this task
TRACE_task_location_not_present(task);
+ DEBUG3("DESTROY %p, %lld, %s", task, task->counter, task->category);
+
//free category
xbt_free(task->category);
return;
{
if (!TRACE_is_active())
return;
+
+ DEBUG0("GET,in");
}
void TRACE_msg_task_get_end(double start_time, m_task_t task)
if (!TRACE_is_active())
return;
- if (!IS_TRACED(task))
+ if (!task->category)
return;
TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajePopState(MSG_get_clock(), "task-state", name);
TRACE_msg_volume_finish(task);
TRACE_task_location(task);
TRACE_task_location_present(task);
+
+ DEBUG3("GET,out %p, %lld, %s", task, task->counter, task->category);
}
/* MSG_task_put related functions */
if (!TRACE_is_active())
return 0;
- if (!IS_TRACED(task))
+ if (!task->category)
return 0;
+ DEBUG3("PUT,in %p, %lld, %s", task, task->counter, task->category);
+
TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajePopState(MSG_get_clock(), "task-state", name);
- if (IS_TRACING_TASKS)
+ if (TRACE_msg_task_is_enabled())
pajePushState(MSG_get_clock(), "task-state", name, "communicate");
TRACE_msg_volume_start(task);
//trace task location grouped by host
TRACE_task_location_not_present(task);
-
- //set current category
- TRACE_msg_category_set(SIMIX_process_self(), task);
return 1;
}
{
if (!TRACE_is_active())
return;
-
- TRACE_category_unset(SIMIX_process_self());
+ DEBUG0("PUT,in");
}
#endif /* HAVE_TRACING */