XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
-std::string instr_process_id(msg_process_t proc)
+std::string instr_pid(msg_process_t proc)
{
return std::string(proc->getCname()) + "-" + std::to_string(proc->getPid());
}
void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
{
- if (TRACE_msg_process_is_enabled()){
+ if (TRACE_actor_is_enabled()) {
static long long int counter = 0;
- std::string key = std::to_string(counter++);
+ std::string key = std::to_string(counter);
+ counter++;
//start link
- container_t msg = simgrid::instr::Container::byName(instr_process_id(process));
- simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK");
- new simgrid::instr::StartLinkEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), type, msg, "M",
- key);
+ container_t msg = simgrid::instr::Container::byName(instr_pid(process));
+ simgrid::instr::LinkType* link = simgrid::instr::Container::getRoot()->getLink("MSG_PROCESS_LINK");
+ link->startEvent(msg, "M", key);
//destroy existing container of this process
- TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
+ TRACE_msg_process_destroy(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);
+ TRACE_msg_process_create(process, new_host);
//end link
- msg = simgrid::instr::Container::byName(instr_process_id(process));
- type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK");
- new simgrid::instr::EndLinkEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), type, msg, "M",
- key);
+ msg = simgrid::instr::Container::byName(instr_pid(process));
+ link->endEvent(msg, "M", key);
}
}
-void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host)
+void TRACE_msg_process_create(msg_process_t process, msg_host_t host)
{
- if (TRACE_msg_process_is_enabled()){
+ if (TRACE_actor_is_enabled()) {
container_t host_container = simgrid::instr::Container::byName(host->getName());
- new simgrid::instr::Container(std::string(process_name) + "-" + std::to_string(process_pid), "MSG_PROCESS",
- host_container);
+ new simgrid::instr::Container(instr_pid(process), "MSG_PROCESS", host_container);
}
}
-void TRACE_msg_process_destroy (const char *process_name, int process_pid)
+void TRACE_msg_process_destroy(msg_process_t process)
{
- if (TRACE_msg_process_is_enabled()) {
- container_t process =
- simgrid::instr::Container::byNameOrNull(std::string(process_name) + "-" + std::to_string(process_pid));
- if (process) {
- process->removeFromParent();
- delete process;
+ if (TRACE_actor_is_enabled()) {
+ container_t container = simgrid::instr::Container::byNameOrNull(instr_pid(process));
+ if (container) {
+ container->removeFromParent();
+ delete container;
}
}
}
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) {
+ if (TRACE_actor_is_enabled() && status == SMX_EXIT_FAILURE) {
//kill means that this process no longer exists, let's destroy it
- TRACE_msg_process_destroy(process->getCname(), process->getPid());
- }
-}
-
-void TRACE_msg_process_suspend(msg_process_t process)
-{
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(process));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->pushEvent(MSG_get_clock(), process_container, "suspend");
- }
-}
-
-void TRACE_msg_process_resume(msg_process_t process)
-{
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(process));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->popEvent(MSG_get_clock(), process_container);
- }
-}
-
-void TRACE_msg_process_sleep_in(msg_process_t process)
-{
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(process));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->pushEvent(MSG_get_clock(), process_container, "sleep");
- }
-}
-
-void TRACE_msg_process_sleep_out(msg_process_t process)
-{
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(process));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->popEvent(MSG_get_clock(), process_container);
+ TRACE_msg_process_destroy(process);
}
}