#ifdef HAVE_TRACING
-static xbt_dict_t task_containers = NULL;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
-static char *TRACE_task_alias_container(m_task_t task, m_process_t process,
- m_host_t host, char *output, int len)
-{
- if (output) {
- snprintf(output, len, "%p-%lld-%p-%p", task, task->counter, process,
- host);
- return output;
- } else {
- return NULL;
- }
-}
-
-static char *TRACE_host_container(m_host_t host, char *output, int len)
-{
- if (output) {
- snprintf(output, len, "%s", MSG_host_get_name(host));
- return output;
- } else {
- return NULL;
- }
-}
-
-char *TRACE_task_container(m_task_t task, char *output, int len)
-{
- if (output) {
- snprintf(output, len, "%p-%lld", task, task->counter);
- return output;
- } else {
- return NULL;
- }
-}
-
-void TRACE_msg_task_alloc(void)
-{
- task_containers = xbt_dict_new();
-}
-
-void TRACE_msg_task_release(void)
+void TRACE_msg_set_task_category(m_task_t task, const char *category)
{
- xbt_dict_free(&task_containers);
-}
+ xbt_assert(task->category == NULL, "Task %p(%s) already has a category (%s).",
+ task, task->name, task->category);
-static void TRACE_task_location(m_task_t task)
-{
- char container[200];
- char name[200], alias[200];
- char *val_one = NULL;
- m_process_t process = NULL;
- m_host_t host = NULL;
- if (!IS_TRACING_TASKS)
+ //if user provides a NULL category, task is no longer traced
+ if (category == NULL) {
+ xbt_free (task->category);
+ task->category = NULL;
+ XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
return;
- process = MSG_process_self();
- host = MSG_process_get_host(process);
-
- //tasks are grouped by host
- 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);
- val_one = xbt_strdup("1");
- xbt_dict_set(task_containers, alias, val_one, xbt_free);
}
-}
-
-static void TRACE_task_location_present(m_task_t task)
-{
- 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
- process = MSG_process_self();
- host = MSG_process_get_host(process);
-
- TRACE_task_alias_container(task, process, host, alias, 200);
- pajePushState(MSG_get_clock(), "presence", alias, "presence");
-}
-
-static void TRACE_task_location_not_present(m_task_t task)
-{
- 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
- process = MSG_process_self();
- host = MSG_process_get_host(process);
-
- TRACE_task_alias_container(task, process, host, alias, 200);
- pajePopState(MSG_get_clock(), "presence", alias);
-}
-
-/*
- * TRACE_msg_set_task_category: tracing interface function
- */
-void TRACE_msg_set_task_category(m_task_t task, const char *category)
-{
- 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);
-
- //tracing task location based on host
- TRACE_task_location(task);
- TRACE_task_location_present(task);
-
- 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");
+ task->category = xbt_strdup (category);
+ XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
}
/* MSG_task_create related function*/
static long long counter = 0;
task->counter = counter++;
task->category = NULL;
+ XBT_DEBUG("CREATE %p, %lld", task, task->counter);
}
/* MSG_task_execute related functions */
void TRACE_msg_task_execute_start(m_task_t task)
{
- char name[200];
- if (!IS_TRACING || !IS_TRACED(task))
- return;
+ XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
- TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
- pajePushState(MSG_get_clock(), "task-state", name, "execute");
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- TRACE_msg_category_set(SIMIX_process_self(), task);
+ container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ val_t value = PJ_value_get ("task_execute", type);
+ new_pajePushState (MSG_get_clock(), process_container, type, value);
+ }
}
void TRACE_msg_task_execute_end(m_task_t task)
{
- char name[200];
- if (!IS_TRACING || !IS_TRACED(task))
- return;
+ XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
- TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
- pajePopState(MSG_get_clock(), "task-state", name);
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- TRACE_category_unset(SIMIX_process_self());
+ container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
+ type_t type = PJ_type_get ("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)
{
- char name[200];
- 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);
+ XBT_DEBUG("DESTROY %p, %lld, %s", task, task->counter, task->category);
//free category
xbt_free(task->category);
+ task->category = NULL;
return;
}
/* MSG_task_get related functions */
void TRACE_msg_task_get_start(void)
{
- if (!IS_TRACING)
- return;
+ XBT_DEBUG("GET,in");
+
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
+
+ container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ val_t value = PJ_value_get ("receive", type);
+ new_pajePushState (MSG_get_clock(), process_container, type, value);
+ }
}
void TRACE_msg_task_get_end(double start_time, m_task_t task)
{
- char name[200];
- if (!IS_TRACING || !IS_TRACED(task))
- return;
+ XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
- TRACE_task_container(task, name, 200);
- if (IS_TRACING_TASKS)
- pajePopState(MSG_get_clock(), "task-state", name);
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- TRACE_msg_volume_finish(task);
+ container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ new_pajePopState (MSG_get_clock(), process_container, type);
- TRACE_task_location(task);
- TRACE_task_location_present(task);
+ char key[INSTR_DEFAULT_STR_SIZE];
+ snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
+ type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
+ new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ }
}
/* MSG_task_put related functions */
int TRACE_msg_task_put_start(m_task_t task)
{
- char name[200];
- if (!IS_TRACING || !IS_TRACED(task))
- return 0;
+ XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
- 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 (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- TRACE_msg_volume_start(task);
+ container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ val_t value = PJ_value_get ("send", type);
+ new_pajePushState (MSG_get_clock(), process_container, type, value);
- //trace task location grouped by host
- TRACE_task_location_not_present(task);
+ char key[INSTR_DEFAULT_STR_SIZE];
+ snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
+ type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
+ new_pajeStartLink(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ }
- //set current category
- TRACE_msg_category_set(SIMIX_process_self(), task);
return 1;
}
void TRACE_msg_task_put_end(void)
{
- if (!IS_TRACING)
- return;
+ XBT_DEBUG("PUT,out");
+
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- TRACE_category_unset(SIMIX_process_self());
+ container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ new_pajePopState (MSG_get_clock(), process_container, type);
+ }
}
#endif /* HAVE_TRACING */
