I forgot to update my tree before commiting (once again), and got conflicts as punishment

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

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 7ea92f3..eee6efd 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -96,6 +96,7 @@ void SIMIX_process_cleanup(smx_process_t process)
   xbt_swag_remove(process, simix_global->process_list);
   xbt_swag_remove(process, process->smx_host->process_list);
   xbt_swag_insert(process, simix_global->process_to_destroy);
+  process->context->iwannadie = 0;
 }
 
 /** 
@@ -155,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);
@@ -176,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) {
 
@@ -221,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);
+    }
+  }
 }
 
 /**
@@ -288,8 +299,8 @@ void SIMIX_process_kill(smx_process_t process) {
         break;
     }
   }
-
-  xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+  if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+    xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
 }
 
 /**
@@ -328,21 +339,26 @@ void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest)
 void SIMIX_pre_process_suspend(smx_simcall_t simcall)
 {
   smx_process_t process = simcall->process_suspend.process;
-  SIMIX_process_suspend(process, simcall->issuer);
+  smx_action_t action_suspend =
+      SIMIX_process_suspend(process, simcall->issuer);
 
   if (process != simcall->issuer) {
     SIMIX_simcall_answer(simcall);
+  } else {
+    xbt_fifo_push(action_suspend->simcalls, simcall);
+    process->waiting_action = action_suspend;
+    SIMIX_host_execution_suspend(process->waiting_action);
   }
   /* If we are suspending ourselves, then just do not finish the simcall now */
 }
 
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
+smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 {
   xbt_assert((process != NULL), "Invalid parameters");
 
   if (process->suspended) {
     XBT_DEBUG("Process '%s' is already suspended", process->name);
-    return;
+    return NULL;
   }
 
   process->suspended = 1;
@@ -372,7 +388,13 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
           xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
               (int)process->waiting_action->type);
       }
+      return NULL;
+    } else {
+      DIE_IMPOSSIBLE;
+      return NULL;
     }
+  } else {
+    return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
   }
 }
 
@@ -380,6 +402,9 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 {
   xbt_assert((process != NULL), "Invalid parameters");
 
+  if(process->context->iwannadie)
+    return;
+
   process->suspended = 0;
 
   /* If we are resuming another process, resume the action it was waiting for
@@ -409,7 +434,9 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
       }
     }
     else {
-      xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+      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);
     }
   }
 }