new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
//destroy existing container of this process
- TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process), old_host);
+ TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
//create new container on the new_host location
TRACE_msg_process_create (MSG_process_get_name (process), MSG_process_get_PID (process), new_host);
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t host_container = PJ_container_get (SIMIX_host_get_name(host));
+ container_t host_container = PJ_container_get (sg_host_get_name(host));
PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
}
}
-void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host)
+void TRACE_msg_process_destroy (const char *process_name, int process_pid)
{
- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
+ if (TRACE_msg_process_is_enabled()) {
+ int len = INSTR_DEFAULT_STR_SIZE;
+ char str[INSTR_DEFAULT_STR_SIZE];
- container_t process = PJ_container_get (instr_process_id_2 (process_name, process_pid, str, len));
- PJ_container_remove_from_parent (process);
- PJ_container_free (process);
+ container_t process = PJ_container_get_or_null(instr_process_id_2(process_name, process_pid, str, len));
+ if (process) {
+ PJ_container_remove_from_parent (process);
+ PJ_container_free (process);
+ }
+ }
}
void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process)
{
if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
//kill means that this process no longer exists, let's destroy it
- TRACE_msg_process_destroy(MSG_process_get_name (process), MSG_process_get_PID (process), MSG_process_get_host (process));
+ TRACE_msg_process_destroy(process->name, process->pid);
}
}
new_pajePopState (MSG_get_clock(), process_container, type);
}
}
-
-void TRACE_msg_process_end(msg_process_t process)
-{
- 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);
- }
-}