X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5bacb2f99189b15a7c740a26b395e7886c41f7e..dc3c3416c4cca30fef7c29422d45094687f59893:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 915cb50254..af820432e2 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -114,20 +114,37 @@ void SD_application_reinit(void)
 
   s_SD_task_t task;
 
-  XBT_DEBUG("Recreating the swags...");
+  SD_task_t done_task, next_done_task;
+
+   XBT_DEBUG("Recreating the swags...");
   xbt_swag_free(sd_global->not_scheduled_task_set);
   xbt_swag_free(sd_global->schedulable_task_set);
   xbt_swag_free(sd_global->scheduled_task_set);
   xbt_swag_free(sd_global->runnable_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->schedulable_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){
+    if (xbt_dynar_is_empty(done_task->tasks_before)){
+      __SD_task_set_state(done_task, SD_SCHEDULABLE);
+    } else{
+      __SD_task_set_state(done_task, SD_NOT_SCHEDULED);
+      done_task->unsatisfied_dependencies =
+        xbt_dynar_length(done_task->tasks_before);
+      done_task->is_not_ready = done_task->unsatisfied_dependencies;
+    }
+    free(done_task->workstation_list);
+    done_task->workstation_list = NULL;
+    done_task->workstation_nb = 0;
+  }
+
+  xbt_swag_free(sd_global->done_task_set);
+
   sd_global->scheduled_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->runnable_task_set =
@@ -142,7 +159,9 @@ void SD_application_reinit(void)
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->task_number = 0;
 
+
 #ifdef HAVE_JEDULE
+  jedule_sd_dump();
   jedule_sd_cleanup();
   jedule_sd_init();
 #endif
@@ -265,6 +284,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
 
+    /* FIXME: shoud look at model_list or model_list_invoke? */
     /* let's see which tasks are done */
     xbt_dynar_foreach(model_list, iter, model) {
       while ((action = xbt_swag_extract(model->states.done_action_set))) {
@@ -430,24 +450,3 @@ void SD_exit(void)
   jedule_sd_cleanup();
 #endif
 }
-
-/**
- * \brief load script file
- */
-
-void SD_load_environment_script(const char *script_file)
-{
-#ifdef HAVE_LUA
-  lua_State *L = lua_open();
-  luaL_openlibs(L);
-
-  if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
-    printf("error: %s\n", lua_tostring(L, -1));
-    return;
-  }
-#else
-  xbt_die
-      ("Lua is not available!! to call SD_load_environment_script, lua should be available...");
-#endif
-  return;
-}