X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..8dfc4298acdf34e7c5b4fa68bc4da8df1ddbc9c6:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 2a251ddef7..bf5707b098 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -94,31 +94,15 @@ void SIMIX_create_maestro_process()
 smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
 
   smx_process_t process;
-
-  if (simix_global->create_process_function) {
-    simix_global->create_process_function(
-        &process,
-        args->name,
-	args->code,
-	args->data,
-	args->hostname,
-	args->argc,
-	args->argv,
-	args->properties);
-  }
-  else {
-    SIMIX_process_create(
-        &process,
-        args->name,
-	args->code,
-	args->data,
-	args->hostname,
-	args->argc,
-	args->argv,
-	args->properties);
-  }
-  // FIXME: to simplify this, simix_global->create_process_function could just
-  // be SIMIX_process_create() by default (and the same thing in smx_deployment.c)
+  simix_global->create_process_function(
+      &process,
+      args->name,
+      args->code,
+      args->data,
+      args->hostname,
+      args->argc,
+      args->argv,
+      args->properties);
 
   return process;
 }
@@ -152,7 +136,7 @@ void SIMIX_process_create(smx_process_t *process,
   else {
     *process = xbt_new0(s_smx_process_t, 1);
 
-    xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
+    xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
 
     /* Process data */
     (*process)->pid = simix_process_maxpid++;
@@ -182,6 +166,24 @@ void SIMIX_process_create(smx_process_t *process,
   }
 }
 
+/**
+ * \brief Executes the processes from simix_global->process_to_run.
+ *
+ * The processes of simix_global->process_to_run are run (in parallel if
+ * possible).  On exit, simix_global->process_to_run is empty, and
+ * simix_global->process_that_ran contains the list of processes that just ran.
+ * The two lists are swapped so, be careful when using them before and after a
+ * call to this function.
+ */
+void SIMIX_process_runall(void)
+{
+  SIMIX_context_runall(simix_global->process_to_run);
+  xbt_dynar_t tmp = simix_global->process_that_ran;
+  simix_global->process_that_ran = simix_global->process_to_run;
+  simix_global->process_to_run = tmp;
+  xbt_dynar_reset(simix_global->process_to_run);
+}
+
 /**
  * \brief Internal function to kill a SIMIX process.
  *
@@ -190,7 +192,7 @@ void SIMIX_process_create(smx_process_t *process,
  *
  * \param process poor victim
  */
-void SIMIX_process_kill(smx_process_t process, smx_process_t killer) {
+void SIMIX_process_kill(smx_process_t process) {
 
   XBT_DEBUG("Killing process %s on %s", process->name, process->smx_host->name);
 
@@ -227,26 +229,22 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t killer) {
     }
   }
 
-  /* If I'm killing myself then stop, otherwise schedule the process to kill. */
-  if (process == killer) {
-    SIMIX_context_stop(process->context);
-  }
-  else {
-    xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
-  }
+  xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
 }
 
 /**
  * \brief Kills all running processes.
- *
- * Only maestro can kill everyone.
+ * \param issuer this one will not be killed
  */
-void SIMIX_process_killall(void)
+void SIMIX_process_killall(smx_process_t issuer)
 {
   smx_process_t p = NULL;
 
-  while ((p = xbt_swag_extract(simix_global->process_list)))
-    SIMIX_process_kill(p, SIMIX_process_self());
+  while ((p = xbt_swag_extract(simix_global->process_list))) {
+    if (p != issuer) {
+      SIMIX_process_kill(p);
+    }
+  }
 
   SIMIX_context_runall(simix_global->process_to_run);
 
@@ -254,16 +252,17 @@ void SIMIX_process_killall(void)
 }
 
 void SIMIX_process_change_host(smx_process_t process,
-    const char *source, const char *dest)
+			       smx_host_t dest)
+{
+  xbt_assert((process != NULL), "Invalid parameters");
+  xbt_swag_remove(process, process->smx_host->process_list);
+  process->smx_host = dest;
+  xbt_swag_insert(process, dest->process_list);
+}
+
+void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest)
 {
-  smx_host_t h1 = NULL;
-  smx_host_t h2 = NULL;
-  xbt_assert0((process != NULL), "Invalid parameters");
-  h1 = SIMIX_host_get_by_name(source);
-  h2 = SIMIX_host_get_by_name(dest);
-  process->smx_host = h2;
-  xbt_swag_remove(process, h1->process_list);
-  xbt_swag_insert(process, h2->process_list);
+  process->new_host = dest;
 }
 
 void SIMIX_pre_process_suspend(smx_req_t req)
@@ -311,7 +310,7 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 
 void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 {
-  xbt_assert0((process != NULL), "Invalid parameters");
+  xbt_assert((process != NULL), "Invalid parameters");
 
   process->suspended = 0;
 
@@ -349,6 +348,7 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
 int SIMIX_process_get_maxpid(void) {
   return simix_process_maxpid;
 }
+
 int SIMIX_process_count(void)
 {
   return xbt_swag_size(simix_global->process_list);
@@ -399,6 +399,18 @@ const char* SIMIX_process_get_name(smx_process_t process)
   return process->name;
 }
 
+smx_process_t SIMIX_process_get_by_name(const char* name)
+{
+  smx_process_t proc;
+
+  xbt_swag_foreach(proc, simix_global->process_list)
+  {
+    if(!strcmp(name, proc->name))
+      return proc;
+  }
+  return NULL;
+}
+
 int SIMIX_process_is_suspended(smx_process_t process)
 {
   return process->suspended;
@@ -430,7 +442,7 @@ smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
   /* check if the host is active */
   if (surf_workstation_model->extension.
       workstation.get_state(host->host) != SURF_RESOURCE_ON) {
-    THROW1(host_error, 0, "Host %s failed, you cannot call this function",
+    THROWF(host_error, 0, "Host %s failed, you cannot call this function",
            host->name);
   }
 
@@ -483,9 +495,6 @@ void SIMIX_process_sleep_destroy(smx_action_t action)
   XBT_DEBUG("Destroy action %p", action);
   if (action->sleep.surf_sleep)
     action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep);
-#ifdef HAVE_TRACING
-  TRACE_smx_action_destroy(action);
-#endif
   xbt_mallocator_release(simix_global->action_mallocator, action);
 }
 
@@ -525,6 +534,11 @@ void SIMIX_process_yield(void)
     self->doexception = 0;
     RETHROW;
   }
+  
+  if (self->new_host) {
+    SIMIX_process_change_host(self, self->new_host);
+    self->new_host = NULL;
+  }
 }
 
 /* callback: context fetching */
@@ -543,6 +557,7 @@ void SIMIX_process_exception_terminate(xbt_ex_t * e)
 smx_context_t SIMIX_process_get_context(smx_process_t p) {
   return p->context;
 }
+
 void SIMIX_process_set_context(smx_process_t p,smx_context_t c) {
   p->context = c;
 }