ONGOING work on exceptions plus minor cleanups.

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

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 21f8d36..aea547c 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -34,7 +34,7 @@ m_process_t MSG_process_create(const char *name,
                               m_process_code_t code, void *data,
                               m_host_t host)
 {
-  return MSG_process_create_with_arguments(name, code, data, host, -1, NULL, 0.0, -1.0);
+  return MSG_process_create_with_arguments(name, code, data, host, -1, NULL);
 }
 
 static void MSG_process_cleanup(void *arg)
@@ -80,8 +80,7 @@ static void MSG_process_cleanup(void *arg)
  */
 m_process_t MSG_process_create_with_arguments(const char *name,
                                              m_process_code_t code, void *data,
-                                             m_host_t host, int argc, char **argv,
-                                             double start_time, double kill_time)
+                                             m_host_t host, int argc, char **argv)
 {
   simdata_process_t simdata = xbt_new0(s_simdata_process_t,1);
   m_process_t process = xbt_new0(s_m_process_t,1);
@@ -95,7 +94,6 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   simdata->waiting_task = NULL;
   simdata->argc = argc;
   simdata->argv = argv;
-  simdata->kill_time = kill_time;
   simdata->context = xbt_context_new(code, NULL, NULL, 
                                     MSG_process_cleanup, process, 
                                     simdata->argc, simdata->argv);
@@ -121,12 +119,7 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   msg_global->current_process = self;
 
   xbt_fifo_push(msg_global->process_list, process);
-  if (start_time == 0.0) {     
-     xbt_fifo_push(msg_global->process_to_run, process);
-  } else {
-     /* FIXME: let the process sleep for the specified amount of time */
-     xbt_fifo_push(msg_global->process_to_run, process);
-  }
+  xbt_fifo_push(msg_global->process_to_run, process);
 
   PAJE_PROCESS_NEW(process);
 
@@ -143,6 +136,8 @@ void MSG_process_kill(m_process_t process)
   int i;
   simdata_process_t p_simdata = process->simdata;
   simdata_host_t h_simdata= p_simdata->host->simdata;
+  int _cursor;
+  m_process_t proc = NULL;
 
 /*   fprintf(stderr,"Killing %s(%d) on %s.\n",process->name, */
 /*       p_simdata->PID,p_simdata->host->name); */
@@ -155,13 +150,19 @@ void MSG_process_kill(m_process_t process)
   }
   if (i==msg_global->max_channel) {
     if(p_simdata->waiting_task) {
+      xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) {
+       if(proc==process) 
+         xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc);
+      }
       if(p_simdata->waiting_task->simdata->compute)
        surf_workstation_resource->common_public->
          action_free(p_simdata->waiting_task->simdata->compute);
-      else if (p_simdata->waiting_task->simdata->comm)
+      else if (p_simdata->waiting_task->simdata->comm) {
        surf_workstation_resource->common_public->
          action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
-      else
+       surf_workstation_resource->common_public->
+         action_free(p_simdata->waiting_task->simdata->comm);
+      } else 
        CRITICAL0("UNKNOWN STATUS. Please report this bug.");
     } else { /* Must be trying to put a task somewhere */
       if(process==MSG_process_self()) {
@@ -172,6 +173,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);
 }
@@ -342,7 +344,6 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
 
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
@@ -392,13 +393,15 @@ MSG_error_t MSG_process_resume(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(process == MSG_process_self()) {
+    MSG_RETURN(MSG_OK);
+  }
 
+  simdata = process->simdata;
 
   if(simdata->blocked) {
     PAJE_PROCESS_POP_STATE(process);
@@ -439,7 +442,7 @@ int MSG_process_isSuspended(m_process_t process)
   return (process->simdata->suspended);
 }
 
-MSG_error_t __MSG_process_block(void)
+int __MSG_process_block(double max_duration)
 {
   m_process_t process = MSG_process_self();
 
@@ -451,6 +454,9 @@ MSG_error_t __MSG_process_block(void)
   process->simdata->blocked=1;
   __MSG_task_execute(process,dummy);
   surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+  if(max_duration>=0)
+    surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute, 
+                                                              max_duration);
   __MSG_wait_for_computation(process,dummy);
   process->simdata->blocked=0;
 
@@ -459,14 +465,13 @@ MSG_error_t __MSG_process_block(void)
   
   MSG_task_destroy(dummy);
 
-  return MSG_OK;
+  return 1;
 }
 
 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();