X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5678149773fe12aedf33dec00c7bda60499d262..75b61335a13287f7a038935382966855d3a7098e:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 215e06a09b..0020a7ac6d 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -118,6 +118,8 @@ void SIMIX_process_empty_trash(void)
 
     xbt_fifo_free(process->comms);
 
+    xbt_dynar_free(&process->on_exit);
+
     free(process->name);
     free(process);
   }
@@ -156,6 +158,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);
@@ -168,7 +171,7 @@ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
  *
  * This function actually creates the process.
  * It may be called when a SIMCALL_PROCESS_CREATE simcall occurs,
- * or directly for SIMIX internal purposes.
+ * or directly for SIMIX internal purposes. The sure thing is that it's called from maestro context.
  *
  * \return the process created
  */
@@ -177,6 +180,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) {
 
@@ -204,7 +208,7 @@ void SIMIX_process_create(smx_process_t *process,
 
     XBT_VERB("Create context %s", (*process)->name);
     (*process)->context = SIMIX_context_new(code, argc, argv,
-    	simix_global->cleanup_process_function, *process);
+      simix_global->cleanup_process_function, *process);
 
     (*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1);
     XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx);
@@ -222,6 +226,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);
+    }
+  }
 }
 
 /**
@@ -276,13 +288,13 @@ void SIMIX_process_kill(smx_process_t process) {
         break;
 
       case SIMIX_ACTION_SLEEP:
-	SIMIX_process_sleep_destroy(process->waiting_action);
-	break;
+  SIMIX_process_sleep_destroy(process->waiting_action);
+  break;
 
       case SIMIX_ACTION_SYNCHRO:
-	SIMIX_synchro_stop_waiting(process, &process->simcall);
-	SIMIX_synchro_destroy(process->waiting_action);
-	break;
+  SIMIX_synchro_stop_waiting(process, &process->simcall);
+  SIMIX_synchro_destroy(process->waiting_action);
+  break;
 
       case SIMIX_ACTION_IO:
         SIMIX_io_destroy(process->waiting_action);
@@ -313,7 +325,7 @@ void SIMIX_process_killall(smx_process_t issuer)
 }
 
 void SIMIX_process_change_host(smx_process_t process,
-			       smx_host_t dest)
+             smx_host_t dest)
 {
   xbt_assert((process != NULL), "Invalid parameters");
   xbt_swag_remove(process, process->smx_host->process_list);
@@ -329,21 +341,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;
@@ -369,11 +386,21 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
           SIMIX_process_sleep_suspend(process->waiting_action);
           break;
 
+        case SIMIX_ACTION_SYNCHRO:
+          /* Suspension is delayed to when the process is rescheduled. */
+          break;
+
         default:
           xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
               (int)process->waiting_action->type);
       }
+      return NULL;
+    } else {
+      /* Suspension is delayed to when the process is rescheduled. */
+      return NULL;
     }
+  } else {
+    return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
   }
 }
 
@@ -381,8 +408,15 @@ 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;
+  XBT_IN("process = %p, issuer = %p", process, issuer);
+
+  if(process->context->iwannadie) {
+    XBT_VERB("Ignoring request to suspend a process that is currently dying.");
+    return;
+  }
+
+  if(!process->suspended) return;
+  process->suspended = 0;
 
   /* If we are resuming another process, resume the action it was waiting for
      if any. Otherwise add it to the list of process to run in the next round. */
@@ -405,16 +439,19 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
           SIMIX_process_sleep_resume(process->waiting_action);
           break;
 
+        case SIMIX_ACTION_SYNCHRO:
+          /* I cannot resume it now. This is delayed to when the process is rescheduled at
+           * the end of the synchro. */
+          break;
+
         default:
           xbt_die("Internal error in SIMIX_process_resume: unexpected action type %d",
               (int)process->waiting_action->type);
       }
     }
-    else {
-      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) {
@@ -547,7 +584,7 @@ void SIMIX_post_process_sleep(smx_action_t action)
 
     switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){
       case SURF_ACTION_FAILED:
-        state = SIMIX_SRC_HOST_FAILURE;
+	SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
         break;
 
       case SURF_ACTION_DONE:
@@ -601,21 +638,27 @@ void SIMIX_process_yield(smx_process_t self)
   /* Ok, maestro returned control to us */
   XBT_DEBUG("Control returned to me: '%s'", self->name);
 
+  if (self->new_host) {
+    SIMIX_process_change_host(self, self->new_host);
+    self->new_host = NULL;
+  }
+
   if (self->context->iwannadie){
     XBT_DEBUG("I wanna die!");
     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;
     SMX_THROW();
   }
-  
-  if (self->new_host) {
-    SIMIX_process_change_host(self, self->new_host);
-    self->new_host = NULL;
-  }
 }
 
 /* callback: context fetching */
@@ -652,13 +695,13 @@ xbt_dynar_t SIMIX_process_get_runnable(void)
  */
 smx_process_t SIMIX_process_from_PID(int PID)
 {
-	smx_process_t proc;
-	xbt_swag_foreach(proc, simix_global->process_list)
-	{
-	 if(proc->pid == PID)
-	 return proc;
-	}
-	return NULL;
+  smx_process_t proc;
+  xbt_swag_foreach(proc, simix_global->process_list)
+  {
+   if(proc->pid == PID)
+   return proc;
+  }
+  return NULL;
 }
 
 /** @brief returns a dynar containg all currently existing processes */
@@ -670,3 +713,23 @@ xbt_dynar_t SIMIX_processes_as_dynar(void) {
   }
   return res;
 }
+void SIMIX_process_on_exit_runall(smx_process_t process) {
+  s_smx_process_exit_fun_t exit_fun;
+
+  while (!xbt_dynar_is_empty(process->on_exit)) {
+    exit_fun = xbt_dynar_pop_as(process->on_exit,s_smx_process_exit_fun_t);
+    (exit_fun.fun)(exit_fun.arg);
+  }
+}
+void SIMIX_process_on_exit(int_f_pvoid_t fun, void *data) {
+  smx_process_t process = SIMIX_process_self();
+  xbt_assert(process, "current process not found: are you in maestro context ?");
+
+  if (!process->on_exit) {
+    process->on_exit = xbt_dynar_new(sizeof(s_smx_process_exit_fun_t), NULL);
+  }
+
+  s_smx_process_exit_fun_t exit_fun = {fun, data};
+
+  xbt_dynar_push_as(process->on_exit,s_smx_process_exit_fun_t,exit_fun);
+}