X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea5d4ac6b57a3771a16f9a998179688088f8b96c..d9cad55dcc546b3936c278258e7f463ac70066df:/src/instr/instr_msg_process.c

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 428cb434e8..e101491298 100644
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -10,15 +10,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
-/*
- * TRACE_msg_set_process_category: tracing interface function
- */
-void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color)
-{
-  xbt_die("deprecated");
-}
-
-char *instr_process_id (m_process_t proc, char *str, int len)
+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);
 }
@@ -30,9 +22,9 @@ char *instr_process_id_2 (const char *process_name, int process_pid, char *str,
 }
 
 /*
- * Instrumentation functions to trace MSG processes (m_process_t)
+ * Instrumentation functions to trace MSG processes (msg_process_t)
  */
-void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_host_t new_host)
+void TRACE_msg_process_change_host(msg_process_t process, m_host_t old_host, m_host_t new_host)
 {
   if (TRACE_msg_process_is_enabled()){
     static long long int counter = 0;
@@ -53,12 +45,7 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_hos
     PJ_container_free(existing_container);
 
     //create new container on the new_host location
-    msg = PJ_container_new(instr_process_id(process, str, len), INSTR_MSG_PROCESS, PJ_container_get(new_host->name));
-
-    //set the state of this new container
-    type = PJ_type_get ("MSG_PROCESS_STATE", msg->type);
-    val_t value = PJ_value_get ("executing", type);
-    new_pajeSetState (MSG_get_clock(), msg, type, value);
+    msg = PJ_container_new(instr_process_id(process, str, len), INSTR_MSG_PROCESS, PJ_container_get(SIMIX_host_get_name(new_host->smx_host)));
 
     //end link
     msg = PJ_container_get(instr_process_id(process, str, len));
@@ -73,16 +60,12 @@ void TRACE_msg_process_create (const char *process_name, int process_pid, m_host
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    container_t host_container = PJ_container_get (host->name);
-    container_t msg = PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
-
-    type_t type = PJ_type_get ("MSG_PROCESS_STATE", msg->type);
-    val_t value = PJ_value_get ("executing", type);
-    new_pajeSetState (MSG_get_clock(), msg, type, value);
+    container_t host_container = PJ_container_get (SIMIX_host_get_name(host->smx_host));
+    PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
   }
 }
 
-void TRACE_msg_process_kill(m_process_t process)
+void TRACE_msg_process_kill(msg_process_t process)
 {
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
@@ -93,7 +76,7 @@ void TRACE_msg_process_kill(m_process_t process)
   }
 }
 
-void TRACE_msg_process_suspend(m_process_t process)
+void TRACE_msg_process_suspend(msg_process_t process)
 {
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
@@ -106,7 +89,7 @@ void TRACE_msg_process_suspend(m_process_t process)
   }
 }
 
-void TRACE_msg_process_resume(m_process_t process)
+void TRACE_msg_process_resume(msg_process_t process)
 {
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
@@ -118,7 +101,7 @@ void TRACE_msg_process_resume(m_process_t process)
   }
 }
 
-void TRACE_msg_process_sleep_in(m_process_t process)
+void TRACE_msg_process_sleep_in(msg_process_t process)
 {
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
@@ -131,7 +114,7 @@ void TRACE_msg_process_sleep_in(m_process_t process)
   }
 }
 
-void TRACE_msg_process_sleep_out(m_process_t process)
+void TRACE_msg_process_sleep_out(msg_process_t process)
 {
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
@@ -143,7 +126,7 @@ void TRACE_msg_process_sleep_out(m_process_t process)
   }
 }
 
-void TRACE_msg_process_end(m_process_t process)
+void TRACE_msg_process_end(msg_process_t process)
 {
   if (TRACE_msg_process_is_enabled()) {
     int len = INSTR_DEFAULT_STR_SIZE;