Continue to reorganize instr

[simgrid.git] / src / msg / instr_msg_process.cpp

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 6547e1d..c3e5b86 100644 (file)
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
 std::string instr_process_id(msg_process_t proc)
 {
-  return proc->getName() + "-" + std::to_string(proc->getPid());
+  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)
@@ -24,8 +24,9 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
 
     //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(), PJ_container_get_root(), type, msg, "M", key);
+    simgrid::instr::LinkType* link =
+        static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK"));
+    link->startEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), msg, "M", key);
 
     //destroy existing container of this process
     TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
@@ -35,8 +36,7 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t 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(), PJ_container_get_root(), type, msg, "M", key);
+    link->endEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), msg, "M", key);
   }
 }
 
@@ -44,8 +44,8 @@ void TRACE_msg_process_create (const char *process_name, int process_pid, msg_ho
 {
   if (TRACE_msg_process_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),
-                                  simgrid::instr::INSTR_MSG_PROCESS, host_container);
+    new simgrid::instr::Container(std::string(process_name) + "-" + std::to_string(process_pid), "MSG_PROCESS",
+                                  host_container);
   }
 }
 
@@ -73,9 +73,9 @@ 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::Type* state   = process_container->type_->byName("MSG_PROCESS_STATE");
-    simgrid::instr::Value* val    = state->getEntityValue("suspend");
-    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, state, val);
+    simgrid::instr::StateType* state =
+        static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+    state->pushEvent(MSG_get_clock(), process_container, "suspend");
   }
 }
 
@@ -83,8 +83,9 @@ 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::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
-    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
+    simgrid::instr::StateType* state =
+        static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+    state->popEvent(MSG_get_clock(), process_container);
   }
 }
 
@@ -92,9 +93,9 @@ 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::Type* state   = process_container->type_->byName("MSG_PROCESS_STATE");
-    simgrid::instr::Value* val    = state->getEntityValue("sleep");
-    new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, state, val);
+    simgrid::instr::StateType* state =
+        static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+    state->pushEvent(MSG_get_clock(), process_container, "sleep");
   }
 }
 
@@ -102,7 +103,8 @@ 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::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
-    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
+    simgrid::instr::StateType* state =
+        static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+    state->popEvent(MSG_get_clock(), process_container);
   }
 }