remove unused lines

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

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 26d4a1c..b82cd23 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -58,8 +58,10 @@ 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 =
+  sd_global->schedulable_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 =
@@ -96,6 +98,7 @@ 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->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);
@@ -105,6 +108,8 @@ void SD_application_reinit(void)
 
     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));
     sd_global->scheduled_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->runnable_task_set =
@@ -256,9 +261,30 @@ xbt_dynar_t SD_simulate(double how_long)
                        dst = dependency->dst;
           if (dst->unsatisfied_dependencies>0)
                  dst->unsatisfied_dependencies--;
+          if (dst->is_not_ready>0)
+                 dst->is_not_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_SCHEDULABLE);
+          }
 
-          if (!(dst->unsatisfied_dependencies) && __SD_task_is_scheduled(dst))
-                 __SD_task_set_state(dst, SD_RUNNABLE);
+          if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E){
+                 SD_dependency_t comm_dep;
+                 SD_task_t comm_dst;
+                 xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep);
+                 comm_dst = comm_dep->dst;
+                 if (__SD_task_is_not_scheduled(comm_dst) &&
+                         comm_dst->is_not_ready>0){
+                         comm_dst->is_not_ready--;
+
+                                 if (!(comm_dst->is_not_ready)){
+                                         __SD_task_set_state(comm_dst, SD_SCHEDULABLE);
+                                 }
+                         }
+          }
 
           /* is dst runnable now? */
           if (__SD_task_is_runnable(dst) && !sd_global->watch_point_reached) {
@@ -336,6 +362,7 @@ void SD_exit(void)
 
     DEBUG0("Destroying 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);