X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d4d060c843a85e0671ccc59900cf42231bc5acb..ff1eebe3071b50372f9bf3048eeec04c610d2788:/src/simdag/sd_task.c

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 3d342ab362..80fa27eda8 100644
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -53,6 +53,8 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
   task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
   task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
   task->unsatisfied_dependencies=0;
+  task->is_not_ready=0;
+
   /* scheduling parameters */
   task->workstation_nb = 0;
   task->workstation_list = NULL;
@@ -120,8 +122,8 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
   case SD_NOT_SCHEDULED:
     task->state_set = sd_global->not_scheduled_task_set;
     break;
-  case SD_READY:
-    task->state_set = sd_global->ready_task_set;
+  case SD_SCHEDULABLE:
+    task->state_set = sd_global->schedulable_task_set;
     break;
   case SD_SCHEDULED:
     task->state_set = sd_global->scheduled_task_set;
@@ -293,9 +295,9 @@ void SD_task_dump(SD_task_t task)
   char *statename;
 
   INFO1("Displaying task %s",SD_task_get_name(task));
-  statename=bprintf("%s %s %s %s %s %s %s",
+  statename=bprintf("%s %s %s %s %s %s %s %s",
       (task->state&SD_NOT_SCHEDULED?"not scheduled":""),
-      (task->state&SD_READY?"ready":""),
+      (task->state&SD_SCHEDULABLE?"schedulable":""),
       (task->state&SD_SCHEDULED?"scheduled":""),
       (task->state&SD_RUNNABLE?"runnable":"not runnable"),
       (task->state&SD_IN_FIFO?"in fifo":""),
@@ -394,16 +396,16 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src,
            "Cannot add a dependency between task '%s' and itself",
            SD_task_get_name(src));
 
-  if (!__SD_task_is_not_scheduled(src) && !__SD_task_is_ready(src)
+  if (!__SD_task_is_not_scheduled(src) && !__SD_task_is_schedulable(src)
       && !__SD_task_is_scheduled_or_runnable(src))
     THROW1(arg_error, 0,
-           "Task '%s' must be SD_NOT_SCHEDULED, SD_READY, SD_SCHEDULED or SD_RUNNABLE",
+           "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED or SD_RUNNABLE",
            SD_task_get_name(src));
 
-  if (!__SD_task_is_not_scheduled(dst) && !__SD_task_is_ready(dst)
+  if (!__SD_task_is_not_scheduled(dst) && !__SD_task_is_schedulable(dst)
       && !__SD_task_is_scheduled_or_runnable(dst))
     THROW1(arg_error, 0,
-           "Task '%s' must be SD_NOT_SCHEDULED, SD_READY, SD_SCHEDULED or SD_RUNNABLE",
+           "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED or SD_RUNNABLE",
            SD_task_get_name(dst));
 
   DEBUG2("SD_task_dependency_add: src = %s, dst = %s", SD_task_get_name(src),
@@ -432,6 +434,7 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src,
   xbt_dynar_push(dst->tasks_before, &dependency);
 
   dst->unsatisfied_dependencies++;
+  dst->is_not_ready++;
 
   /* if the task was runnable, then dst->tasks_before is not empty anymore,
      so we must go back to state SD_SCHEDULED */
@@ -524,6 +527,7 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
       xbt_dynar_remove_at(dynar, i, NULL);
       __SD_task_dependency_destroy(dependency);
       dst->unsatisfied_dependencies--;
+      dst->is_not_ready--;
       found = 1;
     }
   }
@@ -539,8 +543,12 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
 	   if (__SD_task_is_scheduled(dst))
 		   __SD_task_set_state(dst, SD_RUNNABLE);
 	   else
-		   __SD_task_set_state(dst, SD_READY);
+		   __SD_task_set_state(dst, SD_SCHEDULABLE);
    }
+
+   if (dst->is_not_ready == 0)
+	   __SD_task_set_state(dst, SD_SCHEDULABLE);
+
   /*  __SD_print_dependencies(src);
      __SD_print_dependencies(dst); */
 }
@@ -583,9 +591,9 @@ void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst)
 static void __SD_print_watch_points(SD_task_t task)
 {
   static const int state_masks[] =
-    { SD_READY, SD_SCHEDULED, SD_RUNNING, SD_RUNNABLE, SD_DONE, SD_FAILED };
+    { SD_SCHEDULABLE, SD_SCHEDULED, SD_RUNNING, SD_RUNNABLE, SD_DONE, SD_FAILED };
   static const char *state_names[] =
-    { "ready", "scheduled", "running", "runnable", "done", "failed" };
+    { "schedulable", "scheduled", "running", "runnable", "done", "failed" };
   int i;
 
   INFO2("Task '%s' watch points (%x): ", SD_task_get_name(task),
@@ -694,7 +702,7 @@ double SD_task_get_execution_time(SD_task_t task,
 static XBT_INLINE void SD_task_do_schedule(SD_task_t task) {
   SD_CHECK_INIT_DONE();
 
-   if (!__SD_task_is_not_scheduled(task) && !__SD_task_is_ready(task) )
+   if (!__SD_task_is_not_scheduled(task) && !__SD_task_is_schedulable(task) )
      THROW1(arg_error, 0, "Task '%s' has already been scheduled",
             SD_task_get_name(task));
 
@@ -787,7 +795,7 @@ void SD_task_unschedule(SD_task_t task)
     surf_workstation_model->action_cancel(task->surf_action);
   else {
 	  if (task->unsatisfied_dependencies == 0)
-		  __SD_task_set_state(task, SD_READY);
+		  __SD_task_set_state(task, SD_SCHEDULABLE);
 	  else
 		  __SD_task_set_state(task, SD_NOT_SCHEDULED);
   }
@@ -795,7 +803,7 @@ void SD_task_unschedule(SD_task_t task)
   task->start_time = -1.0;
 }
 
-/* Destroys the data memorised by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE.
+/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE.
  */
 static void __SD_task_destroy_scheduling_data(SD_task_t task)
 {
@@ -1315,7 +1323,9 @@ void SD_task_schedulev(SD_task_t task, int count, const SD_workstation_t*list) {
       SD_task_t before = dep->src;
       if (before->kind == SD_TASK_COMM_E2E) {
         before->workstation_list[1] = task->workstation_list[0];
-        if (before->workstation_list[0] && __SD_task_is_ready(before)) {
+
+        if (before->workstation_list[0] &&
+        		(__SD_task_is_schedulable(before) || __SD_task_is_not_scheduled(before))) {
           SD_task_do_schedule(before);
           VERB4("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
               SD_task_get_name(before),
@@ -1328,8 +1338,9 @@ void SD_task_schedulev(SD_task_t task, int count, const SD_workstation_t*list) {
       SD_task_t after = dep->dst;
       if (after->kind == SD_TASK_COMM_E2E) {
         after->workstation_list[0] = task->workstation_list[0];
+        //J-N : Why did you comment on these line (this comment add a bug I think)?
         if (after->workstation_list[1] && (__SD_task_is_not_scheduled(after) ||
-        		__SD_task_is_ready(after))) {
+                                           __SD_task_is_schedulable(after))) {
           SD_task_do_schedule(after);
           VERB4("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
               SD_task_get_name(after),