/* MSG_task_execute related functions */
void TRACE_msg_task_execute_start(msg_task_t task)
-{ paje_value pj_value;
+{
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_msg_process_is_enabled()){
char str[INSTR_DEFAULT_STR_SIZE];
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.PJ_value_get ("task_execute", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::get("task_execute", type);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
}
}
char str[INSTR_DEFAULT_STR_SIZE];
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 PopStateEvent (MSG_get_clock(), process_container, type);
+ simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}
}
/* MSG_task_get related functions */
void TRACE_msg_task_get_start()
-{ paje_value pj_value;
+{
XBT_DEBUG("GET,in");
if (TRACE_msg_process_is_enabled()){
char str[INSTR_DEFAULT_STR_SIZE];
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.PJ_value_get ("receive", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::get("receive", type);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
}
}
char str[INSTR_DEFAULT_STR_SIZE];
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 PopStateEvent (MSG_get_clock(), process_container, type);
+ simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
char key[INSTR_DEFAULT_STR_SIZE];
snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
- type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
- new EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ type = PJ_type_get_root()->getChild("MSG_PROCESS_TASK_LINK");
+ new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
}
}
/* MSG_task_put related functions */
int TRACE_msg_task_put_start(msg_task_t task)
-{ paje_value pj_value;
+{
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_msg_process_is_enabled()){
char str[INSTR_DEFAULT_STR_SIZE];
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.PJ_value_get ("send", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::get("send", type);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
char key[INSTR_DEFAULT_STR_SIZE];
snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
- type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
- new StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ type = PJ_type_get_root()->getChild("MSG_PROCESS_TASK_LINK");
+ new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
}
return 1;
char str[INSTR_DEFAULT_STR_SIZE];
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 PopStateEvent (MSG_get_clock(), process_container, type);
+ simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}
}