jed output written to simgrid.jed

[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..99a8e63 100644 (file)
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -39,7 +39,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,16 +47,15 @@ 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);
   }
 }
@@ -70,14 +69,10 @@ void TRACE_msg_process_create (m_process_t process)
     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");
+
+    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 +94,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 +107,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 +119,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 +132,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);
   }
 }