XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
-/*
- * TRACE_msg_set_process_category: tracing interface function
- */
-void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color)
+char *instr_process_id (m_process_t proc, char *str, int len)
{
- if (!TRACE_msg_process_is_enabled()) return;
-
- xbt_assert3(process->category == NULL,
- "Process %p(%s) already has a category (%s).",
- process, process->name, process->category);
- xbt_assert2(process->name != NULL,
- "Process %p(%s) must have a unique name in order to be traced.",
- process, process->name);
- xbt_assert3(getContainer(process->name)==NULL,
- "Process %p(%s). Tracing already knows a process with name %s."
- "The name of each process must be unique.", process, process->name, process->name);
-
- if (category == NULL) {
- //if user provides a NULL category, process is no longer traced
- xbt_free (process->category);
- process->category = NULL;
- return;
- }
-
- //set process category
- process->category = xbt_strdup(category);
- DEBUG3("MSG process %p(%s), category %s", process, process->name, process->category);
-
- m_host_t host = MSG_process_get_host(process);
- container_t host_container = getContainer(host->name);
- container_t msg = newContainer(process->name, INSTR_MSG_PROCESS, host_container);
- type_t type = getType (category);
- if (!type){
- type = getVariableType(category, color, msg->type);
- }
- new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
+ return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
+}
- type = getType ("MSG_PROCESS_STATE");
- new_pajeSetState (MSG_get_clock(), msg, type, "executing");
+char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
+{
+ snprintf (str, len, "%s-%d", process_name, process_pid);
+ return str;
}
/*
*/
void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_host_t new_host)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
-
- static long long int counter = 0;
- char key[INSTR_DEFAULT_STR_SIZE];
- snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
-
- //start link
- container_t msg = getContainer(process->name);
- type_t type = getType ("MSG_PROCESS_LINK");
- new_pajeStartLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
-
- //destroy existing container of this process
- destroyContainer(getContainer(process->name));
-
- //create new container on the new_host location
- msg = newContainer(process->name, INSTR_MSG_PROCESS, getContainer(new_host->name));
- type = getType (process->category);
- new_pajeSetVariable (MSG_get_clock(), msg, type, 1);
-
- //set the state of this new container
- type = getType ("MSG_PROCESS_STATE");
- new_pajeSetState (MSG_get_clock(), msg, type, "executing");
-
- //end link
- msg = getContainer(process->name);
- type = getType ("MSG_PROCESS_LINK");
- new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
+ if (TRACE_msg_process_is_enabled()){
+ static long long int counter = 0;
+ char key[INSTR_DEFAULT_STR_SIZE];
+ snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
+
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
+
+ //start link
+ container_t msg = PJ_container_get (instr_process_id(process, str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
+ new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+
+ //destroy existing container of this process
+ container_t existing_container = PJ_container_get(instr_process_id(process, str, len));
+ PJ_container_remove_from_parent (existing_container);
+ PJ_container_free(existing_container);
+
+ //create new container on the new_host location
+ msg = PJ_container_new(instr_process_id(process, str, len), INSTR_MSG_PROCESS, PJ_container_get(new_host->name));
+
+ //end link
+ msg = PJ_container_get(instr_process_id(process, str, len));
+ type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
+ new_pajeEndLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ }
+}
+
+void TRACE_msg_process_create (const char *process_name, int process_pid, m_host_t host)
+{
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
+
+ container_t host_container = PJ_container_get (host->name);
+ PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
+ }
}
void TRACE_msg_process_kill(m_process_t process)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- //kill means that this process no longer exists, let's destroy it
- destroyContainer (getContainer(process->name));
+ //kill means that this process no longer exists, let's destroy it
+ PJ_container_free (PJ_container_get (instr_process_id(process, str, len)));
+ }
}
void TRACE_msg_process_suspend(m_process_t process)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
-
- container_t process_container = getContainer (process->name);
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajePushState (MSG_get_clock(), process_container, type, "suspend");
+ 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(process, str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ val_t value = PJ_value_get ("suspend", type);
+ new_pajePushState (MSG_get_clock(), process_container, type, value);
+ }
}
void TRACE_msg_process_resume(m_process_t process)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- container_t process_container = getContainer (process->name);
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajePopState (MSG_get_clock(), process_container, type);
+ container_t process_container = PJ_container_get (instr_process_id(process, str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ new_pajePopState (MSG_get_clock(), process_container, type);
+ }
}
void TRACE_msg_process_sleep_in(m_process_t process)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
-
- container_t process_container = getContainer (process->name);
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajePushState (MSG_get_clock(), process_container, type, "sleep");
+ 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(process, str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ val_t value = PJ_value_get ("sleep", type);
+ new_pajePushState (MSG_get_clock(), process_container, type, value);
+ }
}
void TRACE_msg_process_sleep_out(m_process_t process)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
+ if (TRACE_msg_process_is_enabled()){
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- container_t process_container = getContainer (process->name);
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajePopState (MSG_get_clock(), process_container, type);
+ container_t process_container = PJ_container_get (instr_process_id(process, str, len));
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+ new_pajePopState (MSG_get_clock(), process_container, type);
+ }
}
void TRACE_msg_process_end(m_process_t process)
{
- if (!(TRACE_msg_process_is_enabled() &&
- process->category)) return;
-
- //that's the end, let's destroy it
- destroyContainer (getContainer(process->name));
+ if (TRACE_msg_process_is_enabled()) {
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
+
+ //that's the end, let's destroy it
+ container_t container = PJ_container_get (instr_process_id(process, str, len));
+ PJ_container_remove_from_parent (container);
+ PJ_container_free (container);
+ }
}
#endif /* HAVE_TRACING */
