}
static void sg_instr_new_host(simgrid::s4u::Host& host)
-{ paje_value pj_value;
+{
container_t father = currentContainer.back();
container_t container = PJ_container_new(host.getCname(), INSTR_HOST, father);
if (msg_process == nullptr){
msg_process = PJ_type_container_new("MSG_PROCESS", container->type);
type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
- pj_value.PJ_value_new ("suspend", "1 0 1", state);
- pj_value.PJ_value_new ("sleep", "1 1 0", state);
- pj_value.PJ_value_new ("receive", "1 0 0", state);
- pj_value.PJ_value_new ("send", "0 0 1", state);
- pj_value.PJ_value_new ("task_execute", "0 1 1", state);
+ value PJ_value("suspend", "1 0 1", state);
+ value::get_or_new("sleep", "1 1 0", state);
+ value::get_or_new("receive", "1 0 0", state);
+ value::get_or_new("send", "0 0 1", state);
+ value::get_or_new("task_execute", "0 1 1", state);
PJ_type_link_new ("MSG_PROCESS_LINK", PJ_type_get_root(), msg_process, msg_process);
PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process);
}
if (msg_vm == nullptr){
msg_vm = PJ_type_container_new("MSG_VM", container->type);
type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm);
- pj_value.PJ_value_new ("suspend", "1 0 1", state);
- pj_value.PJ_value_new ("sleep", "1 1 0", state);
- pj_value.PJ_value_new ("receive", "1 0 0", state);
- pj_value.PJ_value_new ("send", "0 0 1", state);
- pj_value.PJ_value_new ("task_execute", "0 1 1", state);
+ value PJ_value("suspend", "1 0 1", state);
+ value::get_or_new("sleep", "1 1 0", state);
+ value::get_or_new("receive", "1 0 0", state);
+ value::get_or_new("send", "0 0 1", state);
+ value::get_or_new("task_execute", "0 1 1", state);
PJ_type_link_new ("MSG_VM_LINK", PJ_type_get_root(), msg_vm, msg_vm);
PJ_type_link_new ("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm);
}
recursiveNewUserStateType (father_type, new_typename, PJ_type_get_root());
}
-static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root)
-{ paje_value pj_value;
+static void recursiveNewValueForUserStateType(const char* type_name, const char* val, const char* color, type_t root)
+{
if (not strcmp(root->name, type_name)) {
- pj_value.PJ_value_new (value, color, root);
+ value PJ_value(val, color, root);
}
xbt_dict_cursor_t cursor = nullptr;
type_t child_type;
char *name;
xbt_dict_foreach(root->children, cursor, name, child_type) {
- recursiveNewValueForUserStateType (type_name, value, color, child_type);
+ recursiveNewValueForUserStateType(type_name, val, color, child_type);
}
}