X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5241f06617eb1d6366a84188287d72a984cef1be..4636dcbf566244aa2c2bff539d0410dae1071c81:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index bbcaf36901..93d7cb6a66 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -119,9 +119,8 @@ xbt_dynar_t SD_simulate(double how_long) {
   /* we stop the simulation when total_time >= how_long */
   double total_time = 0.0;
   SD_task_t task, dst;
-  SD_dependency_t dependency;
   surf_action_t action;
-  unsigned int iter, depcnt;
+  unsigned int iter;
 
   XBT_VERB("Run simulation for %f seconds", how_long);
   sd_global->watch_point_reached = 0;
@@ -129,9 +128,10 @@ xbt_dynar_t SD_simulate(double how_long) {
   xbt_dynar_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
-  for (std::set<SD_task_t>::iterator it=sd_global->executable_tasks->begin();
-       it!=sd_global->executable_tasks->end(); ++it){
+  std::set<SD_task_t>::iterator it=sd_global->executable_tasks->begin();
+  while(it != sd_global->executable_tasks->end()){
     task = *it;
+    it++;
     XBT_VERB("Executing task '%s'", SD_task_get_name(task));
     SD_task_run(task);
     xbt_dynar_push(sd_global->return_set, &task);
@@ -168,15 +168,13 @@ xbt_dynar_t SD_simulate(double how_long) {
         }
 
         /* remove the dependencies after this task */
-        xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
-          dst = dependency->dst;
+        for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it){
+          dst=*it;
           dst->unsatisfied_dependencies--;
           if (dst->is_not_ready > 0)
             dst->is_not_ready--;
-
           XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0",
              SD_task_get_name(dst), dst->unsatisfied_dependencies, dst->is_not_ready);
-
           if (dst->unsatisfied_dependencies == 0) {
             if (SD_task_get_state(dst) == SD_SCHEDULED)
               SD_task_set_state(dst, SD_RUNNABLE);
@@ -187,25 +185,32 @@ xbt_dynar_t SD_simulate(double how_long) {
           if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && dst->is_not_ready == 0) {
             SD_task_set_state(dst, SD_SCHEDULABLE);
           }
+          if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) {
+            XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
+            SD_task_run(dst);
+            xbt_dynar_push(sd_global->return_set, &dst);
+          }
+        }
 
-          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_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->is_not_ready > 0) {
-              comm_dst->is_not_ready--;
+        for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
+          dst=*it;
+          dst->unsatisfied_dependencies = 0;
+          dst->is_not_ready = 0;
+          if (SD_task_get_state(dst) == SD_SCHEDULED)
+             SD_task_set_state(dst, SD_RUNNABLE);
+          else
+             SD_task_set_state(dst, SD_SCHEDULABLE);
+          SD_task_t comm_dst = *(dst->successors->begin());
+          if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED && comm_dst->is_not_ready > 0) {
+            comm_dst->is_not_ready--;
 
             XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0",
-               SD_task_get_name(dst), SD_task_get_name(comm_dst), comm_dst->is_not_ready);
+                SD_task_get_name(dst), SD_task_get_name(comm_dst), comm_dst->is_not_ready);
 
-              if (comm_dst->is_not_ready == 0) {
-                SD_task_set_state(comm_dst, SD_SCHEDULABLE);
-              }
+            if (comm_dst->is_not_ready == 0) {
+              SD_task_set_state(comm_dst, SD_SCHEDULABLE);
             }
           }
-
-          /* is dst runnable now? */
           if (SD_task_get_state(dst) == SD_RUNNABLE && !sd_global->watch_point_reached) {
             XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
             SD_task_run(dst);
@@ -230,8 +235,7 @@ xbt_dynar_t SD_simulate(double how_long) {
   }
 
   if (!sd_global->watch_point_reached && how_long<0 && !sd_global->initial_tasks->empty()) {
-    XBT_WARN("Simulation is finished but %zu tasks are still not done",
-             sd_global->initial_tasks->size());
+    XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size());
     static const char* state_names[] =
       { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };
     for (std::set<SD_task_t>::iterator it=sd_global->initial_tasks->begin();