Make the suspend/resume work while a process is in a syscall.

[simgrid.git] / src / simix / smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 326f0ae..31e46e6 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -156,6 +156,7 @@ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
       args->code,
       args->data,
       args->hostname,
+      args->kill_time,
       args->argc,
       args->argv,
       args->properties);
@@ -177,6 +178,7 @@ void SIMIX_process_create(smx_process_t *process,
                           xbt_main_func_t code,
                           void *data,
                           const char *hostname,
+                          double kill_time,
                           int argc, char **argv,
                           xbt_dict_t properties) {
 
@@ -222,6 +224,14 @@ void SIMIX_process_create(smx_process_t *process,
     XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, host->name);
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, *process);
   }
+
+  if (kill_time > SIMIX_get_clock()) {
+    if (simix_global->kill_process_function) {
+      XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name,
+          (*process)->smx_host->name, kill_time);
+      SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
+    }
+  }
 }
 
 /**
@@ -380,7 +390,7 @@ smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
       }
       return NULL;
     } else {
-      DIE_IMPOSSIBLE;
+      /* Suspension is delayed to when the process is rescheduled. */
       return NULL;
     }
   } else {
@@ -392,9 +402,12 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 {
   xbt_assert((process != NULL), "Invalid parameters");
 
+  XBT_IN("process = %p, issuer = %p", process, issuer);
+
   if(process->context->iwannadie)
     return;
 
+  if(!process->suspended) return;
   process->suspended = 0;
 
   /* If we are resuming another process, resume the action it was waiting for
@@ -423,12 +436,10 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
               (int)process->waiting_action->type);
       }
     }
-    else {
-      DIE_IMPOSSIBLE;
-//      if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
-//        xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
-    }
+    else
+      XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
   }
+  XBT_OUT();
 }
 
 int SIMIX_process_get_maxpid(void) {
@@ -620,6 +631,12 @@ void SIMIX_process_yield(smx_process_t self)
     SIMIX_context_stop(self->context);
   }
 
+  if(self->suspended) {
+    xbt_assert(!self->doexception, "Gloups! This exception may be lost by subsequent calls.");
+    self->suspended = 0;
+    SIMIX_process_suspend(self,self);
+  }
+
   if (self->doexception) {
     XBT_DEBUG("Wait, maestro left me an exception");
     self->doexception = 0;