X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e28b29cf7d18c8f61475480fe6af607bed2df8e2..272ccad1b68b6d9c17069f3c934886925bb15b5d:/src/instr/instr_msg_task.c diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c index 46d28b0136..d190e9a32c 100644 --- a/src/instr/instr_msg_task.c +++ b/src/instr/instr_msg_task.c @@ -10,53 +10,22 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG"); -/* - * TRACE_msg_set_task_category: tracing interface function - */ void TRACE_msg_set_task_category(m_task_t task, const char *category) { - if (!TRACE_is_active()) - 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, - "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, - "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); - DEBUG3("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, - "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); - new_pajePushState (MSG_get_clock(), msg, type, "created"); - } + XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category); } /* MSG_task_create related function*/ @@ -65,46 +34,35 @@ 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); - - if (TRACE_msg_task_is_enabled()){ - container_t task_container = getContainer (task->name); - type_t type = getType ("MSG_TASK_STATE", task_container->type); - new_pajePushState (MSG_get_clock(), task_container, type, "MSG_task_execute"); - } + XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category); 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_pajePushState (MSG_get_clock(), process_container, type, "task_execute"); + 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) { - DEBUG3("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); - } + XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category); 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); + 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); } } @@ -112,12 +70,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); - - if (TRACE_msg_task_is_enabled()){ - //that's the end, let's destroy it - destroyContainer (getContainer(task->name)); - } + XBT_DEBUG("DESTROY %p, %lld, %s", task, task->counter, task->category); //free category xbt_free(task->category); @@ -128,99 +81,56 @@ void TRACE_msg_task_destroy(m_task_t task) /* MSG_task_get related functions */ void TRACE_msg_task_get_start(void) { - DEBUG0("GET,in"); - - if (TRACE_msg_task_is_enabled()){ - //task not received yet, nothing to do - } + 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 = getContainer (instr_process_id(MSG_process_self(), str, len)); - type_t type = getType ("MSG_PROCESS_STATE", process_container->type); - new_pajePushState (MSG_get_clock(), process_container, type, "receive"); + 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) { - DEBUG3("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, msg->type); - new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1); - - type = getType ("MSG_TASK_STATE", msg->type); - new_pajePushState (MSG_get_clock(), msg, type, "created"); - - 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); - } + XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category); 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); + 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); 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); + 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) { - DEBUG3("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); - - //FIXME - //if (TRACE_msg_volume_is_enabled()){ - // TRACE_msg_volume_start(task); - //} - } + XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category); 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_pajePushState (MSG_get_clock(), process_container, type, "send"); + 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); 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); + 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); } return 1; @@ -228,18 +138,14 @@ int TRACE_msg_task_put_start(m_task_t task) void TRACE_msg_task_put_end(void) { - DEBUG0("PUT,out"); - - if (TRACE_msg_task_is_enabled()){ - //task no longer exists here - } + XBT_DEBUG("PUT,out"); 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); + 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); } }