Log improvements.

[simgrid.git] / src / msg / m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index d049c4a..50f83ef 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -29,6 +29,10 @@ m_process_t MSG_process_create(const char *name,
 static void MSG_process_cleanup(void *arg)
 {
 
+  while(((m_process_t)arg)->simdata->paje_state) {
+    PAJE_PROCESS_POP_STATE((m_process_t)arg);
+  }
+
   PAJE_PROCESS_FREE(arg);
 
   xbt_fifo_remove(msg_global->process_list, arg);
@@ -320,7 +324,7 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
-  PAJE_PROCESS_STATE(process,"S");
+  PAJE_PROCESS_PUSH_STATE(process,"S");
 
   if(process!=MSG_process_self()) {
     simdata = process->simdata;
@@ -373,8 +377,9 @@ MSG_error_t MSG_process_resume(m_process_t process)
 
   simdata = process->simdata;
 
+
   if(simdata->blocked) {
-    PAJE_PROCESS_STATE(process,"B");
+    PAJE_PROCESS_POP_STATE(process);
 
     simdata->suspended = 0; /* He'll wake up by itself */
     MSG_RETURN(MSG_OK);
@@ -389,10 +394,10 @@ MSG_error_t MSG_process_resume(m_process_t process)
 
   if(simdata_task->compute) {
     surf_workstation_resource->common_public->resume(simdata_task->compute);
-    PAJE_PROCESS_STATE(process,"E");
+    PAJE_PROCESS_POP_STATE(process);
   }
   else {
-    PAJE_PROCESS_STATE(process,"C");
+    PAJE_PROCESS_POP_STATE(process);
     surf_workstation_resource->common_public->resume(simdata_task->comm);
   }
 
@@ -419,7 +424,7 @@ MSG_error_t __MSG_process_block(void)
   m_task_t dummy = MSG_TASK_UNINITIALIZED;
   dummy = MSG_task_create("blocked", 0.0, 0, NULL);
   
-  PAJE_PROCESS_STATE(process,"B");
+  PAJE_PROCESS_PUSH_STATE(process,"B");
 
   process->simdata->blocked=1;
   __MSG_task_execute(process,dummy);
@@ -455,6 +460,8 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   surf_workstation_resource->common_public->resume(simdata_task->compute);
 
+  PAJE_PROCESS_POP_STATE(process);
+
   MSG_RETURN(MSG_OK);
 }