Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
more robustness in the code by not ignoring situations that we don't now how to deal...
[simgrid.git] / src / simix / smx_global.c
index 3a46a49..8eb92c7 100644 (file)
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/ex.h" /* ex_backtrace_display */
+#include "xbt/str.h"
+#include "xbt/ex.h"             /* ex_backtrace_display */
+XBT_LOG_EXTERNAL_CATEGORY(simix);
+XBT_LOG_EXTERNAL_CATEGORY(simix_action);
+XBT_LOG_EXTERNAL_CATEGORY(simix_deployment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_host);
+XBT_LOG_EXTERNAL_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
+XBT_LOG_EXTERNAL_CATEGORY(simix_context);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
-                               "Logging specific to SIMIX (kernel)");
-
+                                "Logging specific to SIMIX (kernel)");
 
 SIMIX_Global_t simix_global = NULL;
 
 
-/** \defgroup simix_simulation   SIMIX simulation Functions
- *  \brief This section describes the functions you need to know to
- *  set up a simulation. You should have a look at \ref SIMIX_examples 
- *  to have an overview of their usage.
- *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Simulation functions" --> \endhtmlonly
- */
-
-/********************************* SIMIX **************************************/
+/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
+#include <signal.h>
 
-/** \ingroup simix_simulation
- * \brief Initialize some SIMIX internal data.
- */
-void SIMIX_global_init_args(int *argc, char **argv)
+static void _XBT_CALL inthandler(int ignored)
 {
-  SIMIX_global_init(argc,argv);
+  INFO0("CTRL-C pressed. Displaying status and bailing out");
+  SIMIX_display_process_status();
+  exit(1);
 }
 
-/** \ingroup simix_simulation
- * \brief Initialize some SIMIX internal data.
+/********************************* SIMIX **************************************/
+
+/**
+ * \brief Initialize SIMIX internal data.
+ *
+ * \param argc Argc
+ * \param argv Argv
  */
 void SIMIX_global_init(int *argc, char **argv)
 {
-       s_smx_process_t proc;
-
-       if (!simix_global) {
-               surf_init(argc, argv);  /* Initialize some common structures. Warning, it sets simix_global=NULL */
-
-               simix_global = xbt_new0(s_SIMIX_Global_t,1);
-
-               simix_global->host = xbt_fifo_new();
-               simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,synchro_hookup));
-               simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
-               simix_global->current_process = NULL;
-               simix_global->registered_functions = xbt_dict_new();
-
-               simix_global->create_process_function = NULL;
-               simix_global->kill_process_function = NULL;
-       }
+  s_smx_process_t proc;
+
+  if (!simix_global) {
+    /* Connect our log channels: that must be done manually under windows */
+    XBT_LOG_CONNECT(simix_action, simix);
+    XBT_LOG_CONNECT(simix_deployment, simix);
+    XBT_LOG_CONNECT(simix_environment, simix);
+    XBT_LOG_CONNECT(simix_host, simix);
+    XBT_LOG_CONNECT(simix_kernel, simix);
+    XBT_LOG_CONNECT(simix_process, simix);
+    XBT_LOG_CONNECT(simix_synchro, simix);
+    XBT_LOG_CONNECT(simix_context, simix);
+
+    simix_global = xbt_new0(s_SIMIX_Global_t, 1);
+
+    simix_global->host = xbt_dict_new();
+    simix_global->process_to_run =
+      xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
+    simix_global->process_list =
+      xbt_swag_new(xbt_swag_offset(proc, process_hookup));
+    simix_global->process_to_destroy =
+      xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
+
+    simix_global->current_process = NULL;
+    simix_global->maestro_process = NULL;
+    simix_global->registered_functions = xbt_dict_new();
+
+    simix_global->create_process_function = NULL;
+    simix_global->kill_process_function = NULL;
+    simix_global->cleanup_process_function = SIMIX_process_cleanup;
+
+    SIMIX_context_mod_init();
+    SIMIX_create_maestro_process();
+
+    /* context exception handlers */
+    __xbt_ex_ctx = SIMIX_process_get_exception;
+    __xbt_ex_terminate = SIMIX_process_exception_terminate;
+
+
+    /* Prepare to display some more info when dying on Ctrl-C pressing */
+    signal(SIGINT, inthandler);
+    surf_init(argc, argv);      /* Initialize SURF structures */
+  }
 }
 
 /* Debug purpose, incomplete */
-void __SIMIX_display_process_status(void)
+void SIMIX_display_process_status(void)
 {
-   smx_process_t process = NULL;
-   xbt_fifo_item_t item = NULL;
-        smx_action_t act;
-   int nbprocess=xbt_swag_size(simix_global->process_list);
-   
-   INFO1("SIMIX: %d processes are still running, waiting for something.",
-        nbprocess);
-   /*  List the process and their state */
-   INFO0("SIMIX: <process> on <host>: <status>.");
-   xbt_swag_foreach(process, simix_global->process_list) {
-      smx_simdata_process_t p_simdata = (smx_simdata_process_t) process->simdata;
-     // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata;
-      char *who;
-       
-      asprintf(&who,"SIMIX:  %s on %s: %s",
-              process->name,
-                               p_simdata->host->name,
-              (process->simdata->blocked)?"[BLOCKED] "
-              :((process->simdata->suspended)?"[SUSPENDED] ":""));
-                       if (p_simdata->mutex) {
-                               DEBUG1("Block on a mutex: %s", who);                    
-                       }
-                       else if (p_simdata->cond) {
-                               DEBUG1("Block on a condition: %s", who);
-                               DEBUG0("Waiting actions:");
-                               xbt_fifo_foreach(p_simdata->cond->actions,item, act, smx_action_t) {
-                                       DEBUG1("\t %s", act->name);
-                               }
-                       }
-                       else DEBUG1("Unknown block status: %s", who);
+  smx_process_t process = NULL;
+  xbt_fifo_item_t item = NULL;
+  smx_action_t act;
+  int nbprocess = xbt_swag_size(simix_global->process_list);
+
+  INFO1("%d processes are still running, waiting for something.", nbprocess);
+  /*  List the process and their state */
+  INFO0
+    ("Legend of the following listing: \"<process> on <host>: <status>.\"");
+  xbt_swag_foreach(process, simix_global->process_list) {
+    char *who, *who2;
+
+    asprintf(&who, "%s on %s: %s",
+             process->name,
+             process->smx_host->name,
+             (process->blocked) ? "[BLOCKED] "
+             : ((process->suspended) ? "[SUSPENDED] " : ""));
+
+    if (process->mutex) {
+      who2 =
+        bprintf("%s Blocked on mutex %p", who,
+                (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+                process->mutex : (void *) 0xdead);
+      free(who);
+      who = who2;
+    } else if (process->cond) {
+      who2 =
+        bprintf
+        ("%s Blocked on condition %p; Waiting for the following actions:",
+         who,
+         (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+         process->cond : (void *) 0xdead);
+      free(who);
+      who = who2;
+      xbt_fifo_foreach(process->cond->actions, item, act, smx_action_t) {
+        who2 =
+          bprintf("%s '%s'(%p)", who, act->name,
+                  (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
+                  ? act : (void *) 0xdead);
+        free(who);
+        who = who2;
+      }
+    } else if (process->sem) {
+      who2 =
+        bprintf
+        ("%s Blocked on semaphore %p; Waiting for the following actions:",
+         who,
+         (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+         process->sem : (void *) 0xdead);
       free(who);
-   }
+      who = who2;
+      xbt_fifo_foreach(process->sem->actions, item, act, smx_action_t) {
+        who2 =
+          bprintf("%s '%s'(%p)", who, act->name,
+                  (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose))
+                  ? act : (void *) 0xdead);
+        free(who);
+        who = who2;
+      }
+
+    } else {
+      who2 =
+        bprintf
+        ("%s Blocked in an unknown status (please report this bug)", who);
+      free(who);
+      who = who2;
+    }
+    INFO1("%s.", who);
+    free(who);
+  }
 }
 
-/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
-#include <signal.h>
-
-static void _XBT_CALL inthandler(int ignored)
-{
-   INFO0("CTRL-C pressed. Displaying status and bailing out");
-   __SIMIX_display_process_status();
-   exit(1);
-}
 
-/** \ingroup msg_simulation
- * \brief Launch the SIMIX simulation
+/**
+ * \brief Launch the SIMIX simulation, debug purpose
  */
 void __SIMIX_main(void)
 {
-       smx_process_t process = NULL;
-       smx_cond_t cond = NULL;
-       smx_action_t smx_action;
-       xbt_fifo_t actions_done = xbt_fifo_new();
-       xbt_fifo_t actions_failed = xbt_fifo_new();
-
-       /* Prepare to display some more info when dying on Ctrl-C pressing */
-       signal(SIGINT,inthandler);
-
-       /* Clean IO before the run */
-       fflush(stdout);
-       fflush(stderr);
-
-       //surf_solve(); /* Takes traces into account. Returns 0.0 */
-       /* xbt_fifo_size(msg_global->process_to_run) */
-
-       while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
-
-               while ( (smx_action = xbt_fifo_pop(actions_failed)) ) {
-
-                       xbt_fifo_item_t _cursor;
-
-                       DEBUG1("** %s failed **",smx_action->name);
-                       xbt_fifo_foreach(smx_action->cond_list,_cursor,cond,smx_cond_t) {
-                               xbt_swag_foreach(process,cond->sleeping) {
-                                       DEBUG2("\t preparing to wake up %s on %s",           
-                                                       process->name,  process->simdata->host->name);
-                               }
-                               SIMIX_cond_broadcast(cond);
-                               /* remove conditional from action */
-                               xbt_fifo_remove(smx_action->cond_list,cond);
-                       }
-               }
-
-               while ( (smx_action = xbt_fifo_pop(actions_done)) ) {
-                       xbt_fifo_item_t _cursor;
-
-                       DEBUG1("** %s done **",smx_action->name);
-                       xbt_fifo_foreach(smx_action->cond_list,_cursor,cond,smx_cond_t) {
-                               xbt_swag_foreach(process,cond->sleeping) {
-                                       DEBUG2("\t preparing to wake up %s on %s",           
-                                                       process->name,  process->simdata->host->name);
-                               }
-                               SIMIX_cond_broadcast(cond);
-                               /* remove conditional from action */
-                               xbt_fifo_remove(smx_action->cond_list,cond);
-                       }
-               }
-       }
-       return;
+  smx_process_t process = NULL;
+  smx_cond_t cond = NULL;
+  smx_action_t smx_action;
+  xbt_fifo_t actions_done = xbt_fifo_new();
+  xbt_fifo_t actions_failed = xbt_fifo_new();
+
+  /* Clean IO before the run */
+  fflush(stdout);
+  fflush(stderr);
+
+  //surf_solve(); /* Takes traces into account. Returns 0.0 */
+  /* xbt_fifo_size(msg_global->process_to_run) */
+
+  while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
+
+    while ((smx_action = xbt_fifo_pop(actions_failed))) {
+
+      xbt_fifo_item_t _cursor;
+
+      DEBUG1("** %s failed **", smx_action->name);
+      xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
+        xbt_swag_foreach(process, cond->sleeping) {
+          DEBUG2("\t preparing to wake up %s on %s",
+                 process->name, process->smx_host->name);
+        }
+        SIMIX_cond_broadcast(cond);
+        /* remove conditional from action */
+        SIMIX_unregister_action_to_condition(smx_action, cond);
+      }
+    }
+
+    while ((smx_action = xbt_fifo_pop(actions_done))) {
+      xbt_fifo_item_t _cursor;
+
+      DEBUG1("** %s done **", smx_action->name);
+      xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
+        xbt_swag_foreach(process, cond->sleeping) {
+          DEBUG2("\t preparing to wake up %s on %s",
+                 process->name, process->smx_host->name);
+        }
+        SIMIX_cond_broadcast(cond);
+        /* remove conditional from action */
+        SIMIX_unregister_action_to_condition(smx_action, cond);
+      }
+    }
+  }
+  return;
 }
 
-/** \ingroup msg_simulation
+/**
  * \brief Kill all running process
-
- * \param reset_PIDs should we reset the PID numbers. A negative
- *   number means no reset and a positive number will be used to set the PID
- *   of the next newly created process.
+ *  Only maestro can kill everyone :)
  */
 void SIMIX_process_killall()
 {
   smx_process_t p = NULL;
-  smx_process_t self = SIMIX_process_self();
-
-  while((p=xbt_swag_extract(simix_global->process_list))) {
-    if(p!=self) SIMIX_process_kill(p);
-  }
+  xbt_assert0((simix_global->current_process ==
+               simix_global->maestro_process),
+              "You are not supposed to run this function here!");
 
-  xbt_context_empty_trash();
+  while ((p = xbt_swag_extract(simix_global->process_list)))
+    SIMIX_process_kill(p);
 
-  if(self) {
-    xbt_context_yield();
-  }
+  SIMIX_process_empty_trash();
 
   return;
 }
 
-/** \ingroup msg_simulation
+/**
  * \brief Clean the SIMIX simulation
+ *
+ * This functions remove the memory used by SIMIX
  */
 void SIMIX_clean(void)
 {
-  xbt_fifo_item_t i = NULL;
-  smx_host_t h = NULL;
-  smx_process_t p = NULL;
+  /* Kill everyone (except maestro) */
+  SIMIX_process_killall();
 
-
-  while((p=xbt_swag_extract(simix_global->process_list))) {
-    SIMIX_process_kill(p);
-  }
-
-  xbt_fifo_foreach(simix_global->host,i,h,smx_host_t) {
-    __SIMIX_host_destroy(h);
-  }
-  xbt_fifo_free(simix_global->host);
+  /* Free the remaining data structures */
   xbt_swag_free(simix_global->process_to_run);
+  xbt_swag_free(simix_global->process_to_destroy);
   xbt_swag_free(simix_global->process_list);
+  simix_global->process_list = NULL;
+  simix_global->process_to_destroy = NULL;
   xbt_dict_free(&(simix_global->registered_functions));
-  simix_config_finalize();
-  free(simix_global);
+  xbt_dict_free(&(simix_global->host));
+
+  /* Let's free maestro now */
+  SIMIX_context_free(simix_global->maestro_process->context);
+  xbt_free(simix_global->maestro_process->exception);
+  xbt_free(simix_global->maestro_process);
+  simix_global->maestro_process = NULL;
+
+  /* Restore the default exception setup */
+  __xbt_ex_ctx = &__xbt_ex_ctx_default;
+  __xbt_ex_terminate = &__xbt_ex_terminate_default;
+
+  /* Finish context module and SURF */
+  SIMIX_context_mod_exit();
+
   surf_exit();
 
-  return ;
+  xbt_free(simix_global);
+  simix_global = NULL;
+
+  return;
 }
 
 
-/** \ingroup msg_easier_life
+/**
  * \brief A clock (in second).
+ *
+ * \return Return the clock.
  */
-double SIMIX_get_clock(void)
+XBT_INLINE double SIMIX_get_clock(void)
 {
   return surf_get_clock();
 }
 
-double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) 
+/**
+ *     \brief Finish the simulation initialization
+ *
+ *      Must be called before the first call to SIMIX_solve()
+ */
+XBT_INLINE void SIMIX_init(void)
 {
-
-       smx_process_t process = NULL;
-       int i;
-       double elapsed_time = 0.0;
-       static int state_modifications = 1;
-       static int first = 1;
-
-       xbt_context_empty_trash();
-       if(xbt_swag_size(simix_global->process_to_run) && (elapsed_time>0)) {
-               DEBUG0("**************************************************");
-       }
-       if (first) {
-               surf_solve();/* Takes traces into account. Returns 0.0 */
-               first=0;
-       }
-       while ((process = xbt_swag_extract(simix_global->process_to_run))) {
-               DEBUG2("Scheduling %s on %s",        
-                               process->name,
-                               process->simdata->host->name);
-               simix_global->current_process = process;
-               xbt_context_schedule(process->simdata->context);
-               /*       fflush(NULL); */
-               simix_global->current_process = NULL;
-       }
-
-       {
-               surf_action_t action = NULL;
-               surf_resource_t resource = NULL;
-               smx_action_t smx_action = NULL;
-
-               void *fun = NULL;
-               void *arg = NULL;
-
-               xbt_dynar_foreach(resource_list, i, resource) {
-                       if(xbt_swag_size(resource->common_public->states.failed_action_set) ||
-                                       xbt_swag_size(resource->common_public->states.done_action_set)) {
-                               state_modifications = 1;
-                               }
-               }
-
-               if(!state_modifications) {
-                       DEBUG1("%f : Calling surf_solve",SIMIX_get_clock());
-                       elapsed_time = surf_solve();
-                       DEBUG1("Elapsed_time %f",elapsed_time);
-               }
-
-               while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
-                       DEBUG2("got %p %p", fun, arg);
-                       if(fun==SIMIX_process_create_with_arguments) {
-                               process_arg_t args = arg;
-                               DEBUG2("Launching %s on %s", args->name, args->hostname);
-                               process = SIMIX_process_create_with_arguments(args->name, args->code, 
-                                               args->data, args->hostname,
-                                               args->argc,args->argv,NULL);
-                               if(args->kill_time > SIMIX_get_clock()) {
-                                       surf_timer_resource->extension_public->set(args->kill_time, 
-                                                       (void*) &SIMIX_process_kill,
-                                                       (void*) process);
-                               }
-                               xbt_free(args);
-                       }
-                       if(fun==SIMIX_process_kill) {
-                               process = arg;
-                               DEBUG2("Killing %s on %s", process->name, 
-                                               process->simdata->host->name);
-                               SIMIX_process_kill(process);
-                       }
-               }
-
-               /* Wake up all process waiting for the action finish */
-               xbt_dynar_foreach(resource_list, i, resource) {
-                       while ((action = xbt_swag_extract(resource->common_public->states.failed_action_set))) {
-                               smx_action = action->data;
-                               if (smx_action) {
-                                       xbt_fifo_unshift(actions_failed,smx_action);
-                               }
-                       }
-                       while ((action =xbt_swag_extract(resource->common_public->states.done_action_set))) {
-                               smx_action = action->data;
-                               if (smx_action) {
-                                       xbt_fifo_unshift(actions_done,smx_action);
-                               }
-                       }
-               }
-       }
-       state_modifications = 0;
-
-       if (elapsed_time == -1) {
-               if (xbt_swag_size(simix_global->process_list) == 0) {
-                       INFO0("Congratulations ! Simulation terminated : all processes are over");
-               } else {
-                       INFO0("Oops ! Deadlock or code not perfectly clean.");
-                       __SIMIX_display_process_status();
-                       if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
-                                       XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
-                               DEBUG0("Aborting!");
-                               xbt_abort();
-                       }
-                       INFO0("Return a Warning.");
-               }
-       }
-       return elapsed_time;
+  surf_presolve();
 }
 
-
-void SIMIX_timer_set (double date, void *function, void *arg)
+/**
+ *     \brief Does a turn of the simulation
+ *
+ *     Executes a step in the surf simulation, adding to the two lists all the actions that finished on this turn. Schedules all processus in the process_to_run list.
+ *     \param actions_done List of actions done
+ *     \param actions_failed List of actions failed
+ *     \return The time spent to execute the simulation or -1 if the simulation ended
+ */
+double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 {
-       surf_timer_resource->extension_public->set(date, function, arg);
+
+  smx_process_t process = NULL;
+  unsigned int iter;
+  double elapsed_time = 0.0;
+  static int state_modifications = 1;
+  int actions_on_system = 0;
+
+  SIMIX_process_empty_trash();
+  if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
+    DEBUG0("**************************************************");
+  }
+
+  while ((process = xbt_swag_extract(simix_global->process_to_run))) {
+    DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
+    SIMIX_process_schedule(process);
+  }
+
+  {
+    surf_action_t action = NULL;
+    surf_model_t model = NULL;
+    smx_action_t smx_action = NULL;
+
+    void *fun = NULL;
+    void *arg = NULL;
+
+    xbt_dynar_foreach(model_list, iter, model) {
+      if (xbt_swag_size(model->states.failed_action_set)
+          || xbt_swag_size(model->states.done_action_set)) {
+        state_modifications = 1;
+        break;
+      }
+      if (xbt_swag_size(model->states.running_action_set)
+          || xbt_swag_size(model->states.ready_action_set)) {
+        actions_on_system = 1;
+      }
+    }
+    /* only calls surf_solve if there are actions to run */
+    if (!state_modifications && actions_on_system) {
+      DEBUG1("%f : Calling surf_solve", SIMIX_get_clock());
+      elapsed_time = surf_solve();
+      DEBUG1("Elapsed_time %f", elapsed_time);
+    }
+
+    actions_on_system = 0;
+    while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
+      /* change in process, don't quit */
+      actions_on_system = 1;
+      DEBUG2("got %p %p", fun, arg);
+      if (fun == SIMIX_process_create) {
+        smx_process_arg_t args = arg;
+        DEBUG2("Launching %s on %s", args->name, args->hostname);
+        process = SIMIX_process_create(args->name, args->code,
+                                       args->data, args->hostname,
+                                       args->argc, args->argv,
+                                       args->properties);
+        /* verify if process has been created */
+        if (!process) {
+          xbt_free(args);
+          continue;
+        }
+
+        if (args->kill_time > SIMIX_get_clock()) {
+          surf_timer_model->extension.timer.set(args->kill_time, (void *)
+                                                &SIMIX_process_kill,
+                                                (void *) process);
+        }
+        xbt_free(args);
+      } else if (fun == simix_global->create_process_function) {
+        smx_process_arg_t args = arg;
+        DEBUG2("Launching %s on %s", args->name, args->hostname);
+        process =
+          (*simix_global->create_process_function) (args->name, args->code,
+                                                    args->data,
+                                                    args->hostname,
+                                                    args->argc, args->argv,
+                                                    args->properties);
+        /* verify if process has been created */
+        if (!process) {
+          xbt_free(args);
+          continue;
+        }
+        if (args->kill_time > SIMIX_get_clock()) {
+          if (simix_global->kill_process_function)
+            surf_timer_model->extension.timer.set(args->kill_time, (void *)
+                                                  simix_global->
+                                                  kill_process_function,
+                                                  process);
+          else
+            surf_timer_model->extension.timer.set(args->kill_time, (void *)
+                                                  &SIMIX_process_kill,
+                                                  (void *) process);
+        }
+        xbt_free(args);
+      } else if (fun == SIMIX_process_kill) {
+        process = arg;
+        DEBUG2("Killing %s on %s", process->name, process->smx_host->name);
+        SIMIX_process_kill(process);
+      } else if (fun == simix_global->kill_process_function) {
+        process = arg;
+        (*simix_global->kill_process_function) (process);
+      } else {
+        THROW_IMPOSSIBLE;
+      }
+    }
+
+    /* Wake up all process waiting for the action finish */
+    xbt_dynar_foreach(model_list, iter, model) {
+      /* stop simulation case there are no actions to run */
+      if ((xbt_swag_size(model->states.running_action_set)) ||
+          (xbt_swag_size(model->states.ready_action_set)) ||
+          (xbt_swag_size(model->states.done_action_set)) ||
+          (xbt_swag_size(model->states.failed_action_set)))
+        actions_on_system = 1;
+
+      while ((action = xbt_swag_extract(model->states.failed_action_set))) {
+        smx_action = action->data;
+        if (smx_action) {
+          SIMIX_action_signal_all(smx_action);
+        }
+      }
+      while ((action = xbt_swag_extract(model->states.done_action_set))) {
+        smx_action = action->data;
+        if (smx_action) {
+          /* Copy the transfered data of the completed communication actions */
+          /* FIXME: find a better way to determine if its a comm action */
+          if(smx_action->data != NULL)
+            SIMIX_network_copy_data((smx_comm_t)smx_action->data);
+          SIMIX_action_signal_all(smx_action);      
+        }
+      }
+    }
+  }
+  state_modifications = 0;
+  if (!actions_on_system)
+    elapsed_time = -1;
+
+  if (elapsed_time == -1) {
+    if (xbt_swag_size(simix_global->process_list) == 0) {
+/*                     INFO0("Congratulations ! Simulation terminated : all processes are over"); */
+    } else {
+      INFO0("Oops ! Deadlock or code not perfectly clean.");
+      SIMIX_display_process_status();
+      if (XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
+          XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
+        DEBUG0("Aborting!");
+        xbt_abort();
+      }
+      INFO0("Return a Warning.");
+    }
+  }
+  return elapsed_time;
 }
 
-int SIMIX_timer_get(void **function, void **arg)
+/**
+ *     \brief Set the date to execute a function
+ *
+ * Set the date to execute the function on the surf.
+ *     \param date Date to execute function
+ *     \param function Function to be executed
+ *     \param arg Parameters of the function
+ *
+ */
+XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg)
 {
-       return surf_timer_resource->extension_public->get(function, arg);
+  surf_timer_model->extension.timer.set(date, function, arg);
 }
 
+XBT_INLINE int SIMIX_timer_get(void **function, void **arg)
+{
+  return surf_timer_model->extension.timer.get(function, arg);
+}
 
-void SIMIX_function_register_process_create(void * function)
+/**
+ *     \brief Registers a function to create a process.
+ *
+ *     This function registers an user function to be called when a new process is created. The user function have to call the SIMIX_create_process function.
+ *     \param function Create process function
+ *
+ */
+XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t function)
 {
-  xbt_assert0((simix_global->create_process_function == NULL), "Data already set");
+  xbt_assert0((simix_global->create_process_function == NULL),
+              "Data already set");
 
-  /* Assign create process */
   simix_global->create_process_function = function;
-
-  return ;
 }
-void SIMIX_function_register_process_kill(void * function)
+
+/**
+ *     \brief Registers a function to kill a process.
+ *
+ *     This function registers an user function to be called when a new process is killed. The user function have to call the SIMIX_kill_process function.
+ *     \param function Kill process function
+ *
+ */
+XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t function)
 {
-  xbt_assert0((simix_global->kill_process_function == NULL), "Data already set");
+  xbt_assert0((simix_global->kill_process_function == NULL),
+              "Data already set");
 
-  /* Assign kill process */
   simix_global->kill_process_function = function;
+}
 
-  return ;
+/**
+ *     \brief Registers a function to cleanup a process.
+ *
+ *     This function registers an user function to be called when a new process ends properly.
+ *     \param function cleanup process function
+ *
+ */
+XBT_INLINE void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
+{
+  simix_global->cleanup_process_function = function;
 }