Kill "if" before free, and useless cast of free argument.

[simgrid.git] / src / instr / instr_msg_process.c

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 34e2dae..365651c 100644 (file)
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -20,7 +20,12 @@ void TRACE_msg_set_process_category(m_process_t process, const char *category, c
 
 char *instr_process_id (m_process_t proc, char *str, int len)
 {
-  snprintf (str, len, "%s-%d", MSG_process_get_name(proc), MSG_process_get_PID(proc));
+  return instr_process_id_2 (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)
+{
+  snprintf (str, len, "%s-%d", process_name, process_pid);
   return str;
 }
 
@@ -39,7 +44,7 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_hos
 
     //start link
     container_t msg = getContainer(instr_process_id(process, str, len));
-    type_t type = getType ("MSG_PROCESS_LINK");
+    type_t type = getType ("MSG_PROCESS_LINK", getRootType());
     new_pajeStartLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
 
     //destroy existing container of this process
@@ -47,37 +52,31 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_hos
 
     //create new container on the new_host location
     msg = newContainer(instr_process_id(process, str, len), INSTR_MSG_PROCESS, getContainer(new_host->name));
-//    type = getType (process->category);
-//    new_pajeSetVariable (MSG_get_clock(), msg, type, 1);
 
     //set the state of this new container
-    type = getType ("MSG_PROCESS_STATE");
-    new_pajeSetState (MSG_get_clock(), msg, type, "executing");
+    type = getType ("MSG_PROCESS_STATE", msg->type);
+    val_t value = getValueByName ("executing", type);
+    new_pajeSetState (MSG_get_clock(), msg, type, value);
 
     //end link
     msg = getContainer(instr_process_id(process, str, len));
-    type = getType ("MSG_PROCESS_LINK");
+    type = getType ("MSG_PROCESS_LINK", getRootType());
     new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
   }
 }
 
-void TRACE_msg_process_create (m_process_t process)
+void TRACE_msg_process_create (const char *process_name, int process_pid, m_host_t host)
 {
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
 
-    m_host_t host = MSG_process_get_host(process);
     container_t host_container = getContainer(host->name);
-    container_t msg = newContainer(instr_process_id(process, str, len), INSTR_MSG_PROCESS, host_container);
-//    type_t type = getType (category);
-//    if (!type){
-//      type = getVariableType(category, color, msg->type);
-//    }
-//    new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
-
-    type_t type = getType ("MSG_PROCESS_STATE");
-    new_pajeSetState (MSG_get_clock(), msg, type, "executing");
+    container_t msg = newContainer(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
+
+    type_t type = getType ("MSG_PROCESS_STATE", msg->type);
+    val_t value = getValueByName ("executing", type);
+    new_pajeSetState (MSG_get_clock(), msg, type, value);
   }
 }
 
@@ -99,8 +98,9 @@ void TRACE_msg_process_suspend(m_process_t process)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(process, str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
-    new_pajePushState (MSG_get_clock(), process_container, type, "suspend");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = getValueByName ("suspend", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
   }
 }
 
@@ -111,7 +111,7 @@ void TRACE_msg_process_resume(m_process_t process)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(process, str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
     new_pajePopState (MSG_get_clock(), process_container, type);
   }
 }
@@ -123,8 +123,9 @@ void TRACE_msg_process_sleep_in(m_process_t process)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(process, str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
-    new_pajePushState (MSG_get_clock(), process_container, type, "sleep");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = getValueByName ("sleep", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
   }
 }
 
@@ -135,7 +136,7 @@ void TRACE_msg_process_sleep_out(m_process_t process)
     char str[INSTR_DEFAULT_STR_SIZE];
 
     container_t process_container = getContainer (instr_process_id(process, str, len));
-    type_t type = getType ("MSG_PROCESS_STATE");
+    type_t type = getType ("MSG_PROCESS_STATE", process_container->type);
     new_pajePopState (MSG_get_clock(), process_container, type);
   }
 }