char *instr_process_id (m_process_t proc, char *str, int len)
{
- snprintf (str, len, "%s-%d", MSG_process_get_name(proc), MSG_process_get_PID(proc));
+ return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
+}
+
+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;
}
char str[INSTR_DEFAULT_STR_SIZE];
//start link
- container_t msg = getContainer(instr_process_id(process, str, len));
- type_t type = getType ("MSG_PROCESS_LINK");
- new_pajeStartLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
+ 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
- destroyContainer(getContainer(instr_process_id(process, str, len)));
+ 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 = newContainer(instr_process_id(process, str, len), INSTR_MSG_PROCESS, getContainer(new_host->name));
-// type = getType (process->category);
-// new_pajeSetVariable (MSG_get_clock(), msg, type, 1);
+ msg = PJ_container_new(instr_process_id(process, str, len), INSTR_MSG_PROCESS, PJ_container_get(new_host->name));
//set the state of this new container
- type = getType ("MSG_PROCESS_STATE");
- new_pajeSetState (MSG_get_clock(), msg, type, "executing");
+ type = PJ_type_get ("MSG_PROCESS_STATE", msg->type);
+ val_t value = PJ_value_get ("executing", type);
+ new_pajeSetState (MSG_get_clock(), msg, type, value);
//end link
- msg = getContainer(instr_process_id(process, str, len));
- type = getType ("MSG_PROCESS_LINK");
- new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
+ 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 (m_process_t process)
+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];
- m_host_t host = MSG_process_get_host(process);
- container_t host_container = getContainer(host->name);
- container_t msg = newContainer(instr_process_id(process, str, len), 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);
-
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajeSetState (MSG_get_clock(), msg, type, "executing");
+ container_t host_container = PJ_container_get (host->name);
+ container_t msg = PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
+
+ type_t type = PJ_type_get ("MSG_PROCESS_STATE", msg->type);
+ val_t value = PJ_value_get ("executing", type);
+ new_pajeSetState (MSG_get_clock(), msg, type, value);
}
}
char str[INSTR_DEFAULT_STR_SIZE];
//kill means that this process no longer exists, let's destroy it
- destroyContainer (getContainer(instr_process_id(process, str, len)));
+ PJ_container_free (PJ_container_get (instr_process_id(process, str, len)));
}
}
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t process_container = getContainer (instr_process_id(process, str, len));
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajePushState (MSG_get_clock(), process_container, type, "suspend");
+ 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);
}
}
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t process_container = getContainer (instr_process_id(process, str, len));
- type_t type = getType ("MSG_PROCESS_STATE");
+ 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);
}
}
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t process_container = getContainer (instr_process_id(process, str, len));
- type_t type = getType ("MSG_PROCESS_STATE");
- new_pajePushState (MSG_get_clock(), process_container, type, "sleep");
+ 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);
}
}
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t process_container = getContainer (instr_process_id(process, str, len));
- type_t type = getType ("MSG_PROCESS_STATE");
+ 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);
}
}
char str[INSTR_DEFAULT_STR_SIZE];
//that's the end, let's destroy it
- destroyContainer (getContainer(instr_process_id(process, str, len)));
+ container_t container = PJ_container_get (instr_process_id(process, str, len));
+ PJ_container_remove_from_parent (container);
+ PJ_container_free (container);
}
}