a makefile to build the simgrid dll

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

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 06f85c3..f88ccaa 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -179,7 +179,7 @@ void MSG_process_kill(m_process_t process)
 
   xbt_fifo_remove(msg_global->process_to_run,process);
   xbt_fifo_remove(msg_global->process_list,process);
-  xbt_context_free(process->simdata->context);
+  xbt_context_kill(process->simdata->context);
 
   if(process==MSG_process_self()) {
     /* I just killed myself */
@@ -493,6 +493,8 @@ int __MSG_process_block(double max_duration, const char *info)
     DEBUG0("I've been resumed, let's keep going");    
   }
 
+  PAJE_PROCESS_POP_STATE(process);
+
   XBT_OUT;
   return 1;
 }
@@ -519,8 +521,6 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   surf_workstation_resource->common_public->resume(simdata_task->compute);
 
-  PAJE_PROCESS_POP_STATE(process);
-
   XBT_OUT;
 
   MSG_RETURN(MSG_OK);