X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..d3d4c51aace6f9daab7ee7bf664d9d56c81070f8:/src/msg/instr_msg_process.cpp

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index a596982e5c..b4abc6aa33 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -7,6 +7,7 @@
 #include "src/instr/instr_private.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
+#include <simgrid/actor.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
@@ -17,7 +18,7 @@ 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);
@@ -29,10 +30,10 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
     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_pid(process));
@@ -40,53 +41,29 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
   }
 }
 
-void TRACE_msg_process_create(std::string 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(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(std::string 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(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());
+    TRACE_msg_process_destroy(process);
   }
 }
-
-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();
-}