X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d4d30871b78accac640109573494a78237badce..caffead47df585ba6594a74ffa3724691ed0e35c:/src/simix/smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 6ac3a93a01..7a169dde29 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -14,7 +14,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
                                 "Logging specific to SIMIX (process)");
 
-static unsigned long simix_process_count = 0;
+unsigned long simix_process_maxpid = 0;
 
 /**
  * \brief Returns the current agent.
@@ -35,8 +35,8 @@ XBT_INLINE smx_process_t SIMIX_process_self(void)
  */
 void SIMIX_process_cleanup(smx_process_t process)
 {
-  DEBUG1("Cleanup process %s", process->name);
-  xbt_swag_remove(process, simix_global->process_to_run);
+  XBT_DEBUG("Cleanup process %s", process->name);
+  /*xbt_swag_remove(process, simix_global->process_to_run);*/
   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);
@@ -76,11 +76,12 @@ void SIMIX_create_maestro_process()
 
   /* Create maestro process and intilialize it */
   maestro = xbt_new0(s_smx_process_t, 1);
-  maestro->pid = simix_process_count++;
+  maestro->pid = simix_process_maxpid++;
   maestro->name = (char *) "";
   maestro->running_ctx = xbt_new(xbt_running_ctx_t, 1);
   XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
   maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro);
+  maestro->request.issuer = maestro;
 
   simix_global->maestro_process = maestro;
   return;
@@ -93,27 +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) {
-    process = simix_global->create_process_function(args->name,
-	args->code,
-	args->data,
-	args->hostname,
-	args->argc,
-	args->argv,
-	args->properties);
-  }
-  else {
-    process = SIMIX_process_create(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;
 }
@@ -127,55 +116,72 @@ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
  *
  * \return the process created
  */
-smx_process_t SIMIX_process_create(const char *name,
-                                   xbt_main_func_t code,
-				   void *data,
-				   const char *hostname,
-				   int argc, char **argv,
-				   xbt_dict_t properties) {
-
-  smx_process_t process = NULL;
+void SIMIX_process_create(smx_process_t *process,
+                          const char *name,
+                          xbt_main_func_t code,
+                          void *data,
+                          const char *hostname,
+                          int argc, char **argv,
+                          xbt_dict_t properties) {
+
+  *process = NULL;
   smx_host_t host = SIMIX_host_get_by_name(hostname);
 
-  DEBUG2("Start process %s on host %s", name, hostname);
+  XBT_DEBUG("Start process %s on host %s", name, hostname);
 
   if (!SIMIX_host_get_state(host)) {
-    WARN2("Cannot launch process '%s' on failed host '%s'", name,
+    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
           hostname);
   }
   else {
-    process = xbt_new0(s_smx_process_t, 1);
+    *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_count++;
-    process->name = xbt_strdup(name);
-    process->smx_host = host;
-    process->data = data;
+    (*process)->pid = simix_process_maxpid++;
+    (*process)->name = xbt_strdup(name);
+    (*process)->smx_host = host;
+    (*process)->data = data;
 
-    VERB1("Create context %s", process->name);
-    process->context = SIMIX_context_new(code, argc, argv,
-    	simix_global->cleanup_process_function, process);
+    XBT_VERB("Create context %s", (*process)->name);
+    (*process)->context = SIMIX_context_new(code, argc, argv,
+    	simix_global->cleanup_process_function, *process);
 
-    process->running_ctx = xbt_new(xbt_running_ctx_t, 1);
-    XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
+    (*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1);
+    XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx);
 
     /* Add properties */
-    process->properties = properties;
+    (*process)->properties = properties;
 
     /* Add the process to it's host process list */
-    xbt_swag_insert(process, host->process_list);
+    xbt_swag_insert(*process, host->process_list);
 
-    DEBUG1("Start context '%s'", process->name);
+    XBT_DEBUG("Start context '%s'", (*process)->name);
 
     /* Now insert it in the global process list and in the process to run list */
-    xbt_swag_insert(process, simix_global->process_list);
-    DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
-    xbt_swag_insert(process, simix_global->process_to_run);
+    xbt_swag_insert(*process, simix_global->process_list);
+    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);
   }
+}
 
-  return 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);
 }
 
 /**
@@ -186,14 +192,16 @@ smx_process_t SIMIX_process_create(const char *name,
  *
  * \param process poor victim
  */
-void SIMIX_process_kill(smx_process_t process, smx_process_t killer) {
+void SIMIX_process_kill(smx_process_t process) {
 
-  DEBUG2("Killing process %s on %s", process->name, process->smx_host->name);
+  XBT_DEBUG("Killing process %s on %s", process->name, process->smx_host->name);
 
   process->context->iwannadie = 1;
   process->blocked = 0;
   process->suspended = 0;
   /* FIXME: set doexception to 0 also? */
+  /* FIXME: asynchronous communication actions are not destroyed:
+   * another process may find a matching rdv with me after I'm freed */
 
   if (process->waiting_action) {
 
@@ -213,7 +221,7 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t killer) {
 	break;
 
       case SIMIX_ACTION_SYNCHRO:
-	SIMIX_synchro_stop_waiting(process, process->request);
+	SIMIX_synchro_stop_waiting(process, &process->request);
 	SIMIX_synchro_destroy(process->waiting_action);
 	break;
 
@@ -223,41 +231,40 @@ 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_swag_insert(process, simix_global->process_to_run);
-  }
+  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);
 
   SIMIX_process_empty_trash();
 }
 
 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)
@@ -273,8 +280,6 @@ void SIMIX_pre_process_suspend(smx_req_t req)
 
 void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 {
-  xbt_assert0(process, "Invalid parameters");
-
   process->suspended = 1;
 
   /* If we are suspending another process, and it is waiting on an action,
@@ -307,7 +312,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;
 
@@ -337,14 +342,15 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
       }
     }
     else {
-      xbt_swag_insert(process, simix_global->process_to_run);
+      xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
     }
   }
 }
 
 int SIMIX_process_get_maxpid(void) {
-  return simix_process_count;
+  return simix_process_maxpid;
 }
+
 int SIMIX_process_count(void)
 {
   return xbt_swag_size(simix_global->process_list);
@@ -395,17 +401,21 @@ const char* SIMIX_process_get_name(smx_process_t process)
   return process->name;
 }
 
-int SIMIX_process_is_suspended(smx_process_t process)
+smx_process_t SIMIX_process_get_by_name(const char* name)
 {
-  return process->suspended;
+  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_enabled(smx_process_t process)
+int SIMIX_process_is_suspended(smx_process_t process)
 {
-  if (process->request && SIMIX_request_is_enabled(process->request))
-    return TRUE;
-
-  return FALSE;
+  return process->suspended;
 }
 
 xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
@@ -416,8 +426,10 @@ xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
 void SIMIX_pre_process_sleep(smx_req_t req)
 {
   if (MC_IS_ENABLED) {
+    MC_process_clock_add(req->issuer, req->process_sleep.duration);
     req->process_sleep.result = SIMIX_DONE;
     SIMIX_request_answer(req);
+    return;
   }
   smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration);
   xbt_fifo_push(action->request_list, req);
@@ -432,14 +444,13 @@ 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);
   }
 
-  action = xbt_new0(s_smx_action_t, 1);
+  action = xbt_mallocator_get(simix_global->action_mallocator);
   action->type = SIMIX_ACTION_SLEEP;
-  action->request_list = xbt_fifo_new();
-  action->name = xbt_strdup("sleep");
+  action->name = NULL;
 #ifdef HAVE_TRACING
   action->category = NULL;
 #endif
@@ -449,37 +460,44 @@ smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
       surf_workstation_model->extension.workstation.sleep(host->host, duration);
 
   surf_workstation_model->action_data_set(action->sleep.surf_sleep, action);
-  DEBUG1("Create sleep action %p", action);
+  XBT_DEBUG("Create sleep action %p", action);
 
   return action;
 }
 
 void SIMIX_post_process_sleep(smx_action_t action)
 {
-  e_smx_state_t state = SIMIX_action_map_state(surf_workstation_model->action_state_get(action->sleep.surf_sleep));
   smx_req_t req;
+  e_smx_state_t state;
 
   while ((req = xbt_fifo_shift(action->request_list))) {
+
+    switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){
+      case SURF_ACTION_FAILED:
+        state = SIMIX_SRC_HOST_FAILURE;
+        break;
+
+      case SURF_ACTION_DONE:
+        state = SIMIX_DONE;
+        break;
+
+      default:
+        THROW_IMPOSSIBLE;
+        break;
+    }
     req->process_sleep.result = state;
     req->issuer->waiting_action = NULL;
     SIMIX_request_answer(req);
   }
-
   SIMIX_process_sleep_destroy(action);
 }
 
 void SIMIX_process_sleep_destroy(smx_action_t action)
 {
-  DEBUG1("Destroy action %p", action);
-  if (action->name)
-    xbt_free(action->name);
+  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_fifo_free(action->request_list);
-  xbt_free(action);
+  xbt_mallocator_release(simix_global->action_mallocator, action);
 }
 
 void SIMIX_process_sleep_suspend(smx_action_t action)
@@ -500,22 +518,29 @@ void SIMIX_process_yield(void)
 {
   smx_process_t self = SIMIX_process_self();
 
-  DEBUG1("Yield process '%s'", self->name);
+  XBT_DEBUG("Yield process '%s'", self->name);
 
   /* Go into sleep and return control to maestro */
   SIMIX_context_suspend(self->context);
 
   /* Ok, maestro returned control to us */
-  DEBUG1("Maestro returned control to me: '%s'", self->name);
+  XBT_DEBUG("Maestro returned control to me: '%s'", self->name);
 
-  if (self->context->iwannadie)
+  if (self->context->iwannadie){
+    XBT_DEBUG("I wanna die!");
     SIMIX_context_stop(self->context);
+  }
 
   if (self->doexception) {
-    DEBUG0("Wait, maestro left me an exception");
+    XBT_DEBUG("Wait, maestro left me an exception");
     self->doexception = 0;
     RETHROW;
   }
+  
+  if (self->new_host) {
+    SIMIX_process_change_host(self, self->new_host);
+    self->new_host = NULL;
+  }
 }
 
 /* callback: context fetching */
@@ -534,6 +559,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;
 }