Now, a process can be killed and all process are killed at the end of the simulation.

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

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index a3bd124..924f80d 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -45,6 +45,10 @@ static void MSG_process_cleanup(void *arg)
 {
   xbt_fifo_remove(msg_global->process_list, arg);
   xbt_fifo_remove(msg_global->process_to_run, arg);
+  xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
+  xbt_free(((m_process_t) arg)->name);
+  xbt_free(((m_process_t) arg)->simdata);
+  xbt_free(arg);
 }
 
 m_process_t MSG_process_create_with_arguments(const char *name,
@@ -94,6 +98,13 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   return process;
 }
 
+void MSG_process_free(m_process_t process)
+{
+  xbt_fifo_remove(msg_global->process_list,process);
+  xbt_context_free(process->simdata->context);
+  MSG_process_cleanup(process);
+}
+
 /** \ingroup m_process_management
  * \brief Migrates an agent to another location.
  *
@@ -272,20 +283,27 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 
     simdata_task = simdata->waiting_task->simdata;
 
+    simdata->suspended = 1;
+    if(simdata->blocked) return MSG_OK;
+
     xbt_assert0(((simdata_task->compute)||(simdata_task->comm))&&
-               !((simdata_task->comm)&&(simdata_task->comm)),
+               !((simdata_task->compute)&&(simdata_task->comm)),
                "Got a problem in deciding which action to choose !");
+    simdata->suspended = 1;
     if(simdata_task->compute) 
-      surf_workstation_resource->extension_public->suspend(simdata_task->compute);
+      surf_workstation_resource->common_public->suspend(simdata_task->compute);
     else
-      surf_workstation_resource->extension_public->suspend(simdata_task->comm);
+      surf_workstation_resource->common_public->suspend(simdata_task->comm);
   } else {
     m_task_t dummy = MSG_TASK_UNINITIALIZED;
     dummy = MSG_task_create("suspended", 0.0, 0, NULL);
 
+    simdata = process->simdata;
+    simdata->suspended = 1;
     __MSG_task_execute(process,dummy);
-    surf_workstation_resource->extension_public->suspend(dummy->simdata->compute);
+    surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
     __MSG_wait_for_computation(process,dummy);
+    simdata->suspended = 0;
 
     MSG_task_destroy(dummy);
   }
@@ -308,16 +326,23 @@ MSG_error_t MSG_process_resume(m_process_t process)
   CHECK_HOST();
 
   simdata = process->simdata;
+
+  if(simdata->blocked) {
+    simdata->suspended = 0; /* He'll wake up by itself */
+    MSG_RETURN(MSG_OK);
+  }
+
   if(!(simdata->waiting_task)) {
     xbt_assert0(0,"Process not waiting for anything else. Weird !");
     return MSG_WARNING;
   }
   simdata_task = simdata->waiting_task->simdata;
 
+
   if(simdata_task->compute) 
-    surf_workstation_resource->extension_public->resume(simdata_task->compute);
+    surf_workstation_resource->common_public->resume(simdata_task->compute);
   else 
-    surf_workstation_resource->extension_public->resume(simdata_task->comm);
+    surf_workstation_resource->common_public->resume(simdata_task->comm);
 
   MSG_RETURN(MSG_OK);
 }
@@ -329,23 +354,63 @@ MSG_error_t MSG_process_resume(m_process_t process)
  * task on which it was waiting for the completion.
  */
 int MSG_process_isSuspended(m_process_t process)
+{
+  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+
+  return (process->simdata->suspended);
+}
+
+
+
+
+
+MSG_error_t __MSG_process_block(void)
+{
+  m_process_t process = MSG_process_self();
+
+  m_task_t dummy = MSG_TASK_UNINITIALIZED;
+  dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+  
+  process->simdata->blocked=1;
+  __MSG_task_execute(process,dummy);
+  surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+  __MSG_wait_for_computation(process,dummy);
+  process->simdata->blocked=0;
+
+  if(process->simdata->suspended)
+    MSG_process_suspend(process);
+  
+  MSG_task_destroy(dummy);
+
+  return MSG_OK;
+}
+
+MSG_error_t __MSG_process_unblock(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
   int i;
-  
+
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+  CHECK_HOST();
 
   simdata = process->simdata;
   if(!(simdata->waiting_task)) {
     xbt_assert0(0,"Process not waiting for anything else. Weird !");
-    return 0;
+    return MSG_WARNING;
   }
-
   simdata_task = simdata->waiting_task->simdata;
 
-  if(simdata_task->compute) 
-    return surf_workstation_resource->extension_public->is_suspended(simdata_task->compute);
-  else 
-    return surf_workstation_resource->extension_public->is_suspended(simdata_task->comm);
+  xbt_assert0(simdata->blocked,"Process not blocked");
+
+  surf_workstation_resource->common_public->resume(simdata_task->compute);
+
+  MSG_RETURN(MSG_OK);
+}
+
+int __MSG_process_isBlocked(m_process_t process)
+{
+  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+
+  return (process->simdata->blocked);
 }