X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/032adb38e7ca98cf32feceb4fc7e00a539a64fcb..100576aab36daab0f4674d9a6c1044925bc8853c:/src/msg/instr_msg_process.cpp

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 6547e1df2a..ceaafb28fc 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -10,9 +10,9 @@
 
 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 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)
@@ -20,12 +20,14 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
   if (TRACE_msg_process_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(), PJ_container_get_root(), type, msg, "M", key);
+    container_t msg                = simgrid::instr::Container::byName(instr_pid(process));
+    container_t root               = simgrid::instr::Container::getRootContainer();
+    simgrid::instr::LinkType* link = root->getLink("MSG_PROCESS_LINK");
+    link->startEvent(root, msg, "M", key);
 
     //destroy existing container of this process
     TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
@@ -34,26 +36,23 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
     TRACE_msg_process_create (MSG_process_get_name (process), MSG_process_get_PID (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(), PJ_container_get_root(), type, msg, "M", key);
+    msg = simgrid::instr::Container::byName(instr_pid(process));
+    link->endEvent(root, msg, "M", key);
   }
 }
 
-void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host)
+void TRACE_msg_process_create(std::string process_name, int process_pid, msg_host_t host)
 {
   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(process_name + "-" + std::to_string(process_pid), "MSG_PROCESS", host_container);
   }
 }
 
-void TRACE_msg_process_destroy (const char *process_name, int process_pid)
+void TRACE_msg_process_destroy(std::string process_name, int process_pid)
 {
   if (TRACE_msg_process_is_enabled()) {
-    container_t process =
-        simgrid::instr::Container::byNameOrNull(std::string(process_name) + "-" + std::to_string(process_pid));
+    container_t process = simgrid::instr::Container::byNameOrNull(process_name + "-" + std::to_string(process_pid));
     if (process) {
       process->removeFromParent();
       delete process;
@@ -71,38 +70,24 @@ void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t proc
 
 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);
-  }
+  if (TRACE_msg_process_is_enabled())
+    simgrid::instr::Container::byName(instr_pid(process))->getState("MSG_PROCESS_STATE")->pushEvent("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::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
-    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
-  }
+  if (TRACE_msg_process_is_enabled())
+    simgrid::instr::Container::byName(instr_pid(process))->getState("MSG_PROCESS_STATE")->popEvent();
 }
 
 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);
-  }
+  if (TRACE_msg_process_is_enabled())
+    simgrid::instr::Container::byName(instr_pid(process))->getState("MSG_PROCESS_STATE")->pushEvent("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::Type* type    = process_container->type_->byName("MSG_PROCESS_STATE");
-    new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
-  }
+  if (TRACE_msg_process_is_enabled())
+    simgrid::instr::Container::byName(instr_pid(process))->getState("MSG_PROCESS_STATE")->popEvent();
 }