Reintroduce a SD_READY state, which now means "ready" in a scheduling

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

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index aeab84f..e7d4735 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -58,10 +58,12 @@ void SD_init(int *argc, char **argv)
 
   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->scheduled_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->runnable_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 =
@@ -96,8 +98,9 @@ void SD_application_reinit(void)
   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->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);
@@ -105,9 +108,11 @@ void SD_application_reinit(void)
 
     sd_global->not_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->scheduled_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->ready_task_set =
+    sd_global->runnable_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));
@@ -175,7 +180,7 @@ void SD_create_environment(const char *platform_file)
 /**
  * \brief Launches the simulation.
  *
- * The function will execute the \ref SD_READY ready tasks.
+ * The function will execute the \ref SD_RUNNABLE runnable tasks.
  * The simulation will be stopped when its time reaches \a how_long,
  * when a watch point is reached, or when no more task can be executed.
  * Then you can call SD_simulate() again.
@@ -184,14 +189,13 @@ void SD_create_environment(const char *platform_file)
  * \return a NULL-terminated array of \ref SD_task_t whose state has changed.
  * \see SD_task_schedule(), SD_task_watch()
  */
-SD_task_t *SD_simulate(double how_long)
+xbt_dynar_t SD_simulate(double how_long)
 {
   double total_time = 0.0;      /* we stop the simulation when total_time >= how_long */
   double elapsed_time = 0.0;
   SD_task_t task, task_safe, dst;
   SD_dependency_t dependency;
   surf_action_t action;
-  SD_task_t *res = NULL;
   xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
   unsigned int iter, depcnt;
   static int first_time = 1;
@@ -211,8 +215,8 @@ SD_task_t *SD_simulate(double how_long)
   }
   sd_global->watch_point_reached = 0;
 
-  /* explore the ready tasks */
-  xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) {
+  /* explore the runnable tasks */
+  xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
     VERB1("Executing task '%s'", SD_task_get_name(task));
     if (__SD_task_try_to_run(task) && !xbt_dynar_member(changed_tasks, &task))
       xbt_dynar_push(changed_tasks, &task);
@@ -258,11 +262,15 @@ SD_task_t *SD_simulate(double how_long)
           if (dst->unsatisfied_dependencies>0)
                  dst->unsatisfied_dependencies--;
 
-          if (!(dst->unsatisfied_dependencies) && __SD_task_is_scheduled(dst))
-                 __SD_task_set_state(dst, SD_READY);
+          if (!(dst->unsatisfied_dependencies)){
+                 if (__SD_task_is_scheduled(dst))
+                         __SD_task_set_state(dst, SD_RUNNABLE);
+                 else
+                         __SD_task_set_state(dst, SD_READY);
+          }
 
-          /* is dst ready now? */
-          if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
+          /* is dst runnable now? */
+          if (__SD_task_is_runnable(dst) && !sd_global->watch_point_reached) {
             VERB1("Executing task '%s'", SD_task_get_name(dst));
             if (__SD_task_try_to_run(dst) &&
                 !xbt_dynar_member(changed_tasks, &task))
@@ -290,19 +298,12 @@ SD_task_t *SD_simulate(double how_long)
     }
   }
 
-  res = xbt_new0(SD_task_t, (xbt_dynar_length(changed_tasks) + 1));
-
-  xbt_dynar_foreach(changed_tasks, iter, task) {
-    res[iter] = task;
-  }
-  xbt_dynar_free(&changed_tasks);
-
   VERB0("Simulation finished");
   DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
          elapsed_time, total_time, sd_global->watch_point_reached);
   DEBUG1("current time = %f", surf_get_clock());
 
-  return res;
+  return changed_tasks;
 }
 
 /**
@@ -344,8 +345,9 @@ void SD_exit(void)
 
     DEBUG0("Destroying 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->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);