Some new files of the cxx version of the MSG API

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index c204eca..c797d56 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -9,6 +9,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/str.h"
 #include "xbt/ex.h"            /* ex_backtrace_display */
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                "Logging specific to SIMIX (kernel)");
@@ -119,7 +120,7 @@ void SIMIX_global_init(int *argc, char **argv)
        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;
     simix_global->cleanup_process_function = SIMIX_process_cleanup;
@@ -295,6 +296,7 @@ void SIMIX_clean(void)
   simix_config_finalize();
   free(simix_global);
   simix_global = NULL;
+  
   surf_exit();
 
   return;
@@ -311,6 +313,15 @@ double SIMIX_get_clock(void)
   return surf_get_clock();
 }
 
+/**
+ *     \brief Finish the simulation initialization 
+ * 
+ *      Must be called before the first call to SIMIX_solve()
+ */
+void SIMIX_init(void) {
+    surf_presolve();
+}
+
 /**
  *     \brief Does a turn of the simulation
  *
@@ -326,16 +337,12 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   unsigned int iter;
   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->smx_host->name);