X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce9fe8ed764878bee5d61a7720f124245cea072e..acd052f4e734a5580577a6462a6e08c0ea3b5509:/src/msg/instr_msg_process.cpp

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 1d4201b9be..61bba1d6f6 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -17,16 +17,16 @@ std::string instr_pid(msg_process_t proc)
 
 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_pid(process));
-    simgrid::instr::LinkType* link =
-        static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK"));
-    link->startEvent(simgrid::instr::Container::getRootContainer(), 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));
@@ -36,13 +36,13 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
 
     //end link
     msg = simgrid::instr::Container::byName(instr_pid(process));
-    link->endEvent(simgrid::instr::Container::getRootContainer(), msg, "M", key);
+    link->endEvent(msg, "M", key);
   }
 }
 
 void TRACE_msg_process_create(std::string process_name, int process_pid, 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(process_name + "-" + std::to_string(process_pid), "MSG_PROCESS", host_container);
   }
@@ -50,7 +50,7 @@ void TRACE_msg_process_create(std::string process_name, int process_pid, msg_hos
 
 void TRACE_msg_process_destroy(std::string process_name, int process_pid)
 {
-  if (TRACE_msg_process_is_enabled()) {
+  if (TRACE_actor_is_enabled()) {
     container_t process = simgrid::instr::Container::byNameOrNull(process_name + "-" + std::to_string(process_pid));
     if (process) {
       process->removeFromParent();
@@ -61,32 +61,8 @@ void TRACE_msg_process_destroy(std::string process_name, int process_pid)
 
 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())
-    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())
-    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())
-    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())
-    simgrid::instr::Container::byName(instr_pid(process))->getState("MSG_PROCESS_STATE")->popEvent();
-}