Don't use %t in log format, but %P; revalidate the output after listener introduction

[simgrid.git] / src / simdag / sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 21cda51..d1a3ae7 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -20,9 +20,10 @@ SD_global_t sd_global = NULL;
  * \see SD_create_environment(), SD_exit()
  */
 void SD_init(int *argc, char **argv) {
-  if (SD_INITIALISED()) {
-    xbt_assert0(0, "SD_init() already called");
-  }
+
+  s_SD_task_t task;
+  
+  xbt_assert0( !SD_INITIALISED() , "SD_init() already called");
 
   sd_global = xbt_new(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
@@ -34,7 +35,6 @@ void SD_init(int *argc, char **argv) {
   sd_global->recyclable_route = NULL;
   sd_global->watch_point_reached = 0;
 
-  s_SD_task_t task;
   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));
@@ -47,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
  *
@@ -132,6 +175,10 @@ SD_task_t* SD_simulate(double how_long)
     first_time = 0;
   }
 
+  if(how_long>0) {
+    surf_timer_resource->extension_public->set(surf_get_clock()+how_long,
+                                              NULL,NULL);
+  }
   sd_global->watch_point_reached = 0;
 
   /* explore the ready tasks */
@@ -154,6 +201,10 @@ SD_task_t* SD_simulate(double how_long)
   while (elapsed_time >= 0.0 &&
         (how_long < 0.0 || total_time < how_long) &&
         !sd_global->watch_point_reached) {
+    /* dumb variables */
+    void *fun = NULL;
+    void *arg = NULL;
+
 
     DEBUG1("Total time: %f", total_time);
 
@@ -226,6 +277,9 @@ SD_task_t* SD_simulate(double how_long)
        changed_tasks[changed_task_number] = NULL;
       }
     }
+
+    while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
+    }
   }
 
   /* we must reset every task->state_changed */
@@ -293,7 +347,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! */
   }
 }