New function SD_application_reinit() allowing to test several heuristics back to...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3200 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h
index 96ee925..301e4b6 100644 (file)
--- a/include/simdag/simdag.h
+++ b/include/simdag/simdag.h
@@ -131,6 +131,7 @@ XBT_PUBLIC(int)               SD_task_dependency_exists(SD_task_t src, SD_task_t
  *  @{
  */
 XBT_PUBLIC(void)              SD_init(int *argc, char **argv);
+XBT_PUBLIC(void)              SD_application_reinit(void);
 XBT_PUBLIC(void)              SD_create_environment(const char *platform_file);
 XBT_PUBLIC(SD_task_t*)        SD_simulate(double how_long);
 XBT_PUBLIC(double)            SD_get_clock(void);

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index e92a175..6729f0d 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -23,9 +23,7 @@ void SD_init(int *argc, char **argv) {
 
   s_SD_task_t task;
   
-  if (SD_INITIALISED()) {
-    xbt_assert0(0, "SD_init() already called");
-  }
+  xbt_assert0( !SD_INITIALISED() , "SD_init() already called");
 
   sd_global = xbt_new(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
@@ -49,6 +47,49 @@ void SD_init(int *argc, char **argv) {
   surf_init(argc, argv);
 }
 
+/**
+ * \brief Reinits the application part of the simulation (experimental feature)
+ * 
+ * This function allows you to run several simulations on the same platform 
+ * by resetting the part describing the application. 
+ * 
+ * @warning: this function is still experimental and not perfect. For example,
+ * the simulation clock (and traces usage) is not reset. So, do not use it if
+ * you use traces in your simulation, and do not use absolute timing after using it.
+ * That being said, this function is still precious if you want to compare a bunch of
+ * heuristics on the same platforms.
+ */
+void SD_application_reinit(void) {
+   
+  s_SD_task_t task;
+   
+  if (SD_INITIALISED()) {
+    DEBUG0("Recreating the swags...");
+    xbt_swag_free(sd_global->not_scheduled_task_set);
+    xbt_swag_free(sd_global->scheduled_task_set);
+    xbt_swag_free(sd_global->ready_task_set);
+    xbt_swag_free(sd_global->in_fifo_task_set);
+    xbt_swag_free(sd_global->running_task_set);
+    xbt_swag_free(sd_global->done_task_set);
+    xbt_swag_free(sd_global->failed_task_set);
+
+    sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->ready_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->in_fifo_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->task_number = 0;
+  } else {
+    WARN0("SD_application_reinit called before initialization of SimDag");
+    /* we cannot use exceptions here because xbt is not running! */
+  }
+
+}
+
+
+
 /**
  * \brief Creates the environment
  *
@@ -295,7 +336,7 @@ void SD_exit(void) {
     surf_exit();
   }
   else {
-    fprintf(stderr, "Warning: SD_exit() called while SimDag was not running\n");
+    WARN0("SD_exit() called, but SimDag is not running");
     /* we cannot use exceptions here because xbt is not running! */
   }
 }