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

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 1af7c9621f..bcdb775ff8 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -4,14 +4,14 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "src/simix/ActorImpl.hpp"
 #include "msg_private.h"
-#include "src/simix/smx_process_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
 char *instr_process_id (msg_process_t proc, char *str, int len)
 {
-  return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
+  return instr_process_id_2 (proc->name.c_str(), proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
 }
 
 char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
@@ -40,7 +40,7 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m
     new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
 
     //destroy existing container of this process
-    TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process), old_host);
+    TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (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);
@@ -58,26 +58,30 @@ void TRACE_msg_process_create (const char *process_name, int process_pid, msg_ho
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t host_container = PJ_container_get (SIMIX_host_get_name(host));
+    container_t host_container = PJ_container_get (sg_host_get_name(host));
     PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
   }
 }
 
-void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host)
+void TRACE_msg_process_destroy (const char *process_name, int process_pid)
 {
-  int len = INSTR_DEFAULT_STR_SIZE;
-  char str[INSTR_DEFAULT_STR_SIZE];
+  if (TRACE_msg_process_is_enabled()) {
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
 
-  container_t process = PJ_container_get (instr_process_id_2 (process_name, process_pid, str, len));
-  PJ_container_remove_from_parent (process);
-  PJ_container_free (process);
+    container_t process = PJ_container_get_or_null(instr_process_id_2(process_name, process_pid, str, len));
+    if (process) {
+      PJ_container_remove_from_parent (process);
+      PJ_container_free (process);
+    }
+  }
 }
 
 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){
     //kill means that this process no longer exists, let's destroy it
-    TRACE_msg_process_destroy(MSG_process_get_name (process), MSG_process_get_PID (process), MSG_process_get_host (process));
+    TRACE_msg_process_destroy(process->name.c_str(), process->pid);
   }
 }
 
@@ -130,16 +134,3 @@ void TRACE_msg_process_sleep_out(msg_process_t process)
     new_pajePopState (MSG_get_clock(), process_container, type);
   }
 }
-
-void TRACE_msg_process_end(msg_process_t process)
-{
-  if (TRACE_msg_process_is_enabled()) {
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    //that's the end, let's destroy it
-    container_t container = PJ_container_get (instr_process_id(process, str, len));
-    PJ_container_remove_from_parent (container);
-    PJ_container_free (container);
-  }
-}