merge

[simgrid.git] / src / simdag / private.h

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 9a90996..243a9e0 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -36,8 +36,9 @@ typedef struct SD_global {
 
   /* task state sets */
   xbt_swag_t not_scheduled_task_set;
+  xbt_swag_t schedulable_task_set;
   xbt_swag_t scheduled_task_set;
-  xbt_swag_t ready_task_set;
+  xbt_swag_t runnable_task_set;
   xbt_swag_t in_fifo_task_set;
   xbt_swag_t running_task_set;
   xbt_swag_t done_task_set;
@@ -87,6 +88,8 @@ typedef struct SD_task {
   /* dependencies */
   xbt_dynar_t tasks_before;
   xbt_dynar_t tasks_after;
+  unsigned int unsatisfied_dependencies;
+  unsigned int is_not_ready;
 
   /* scheduling parameters (only exist in state SD_SCHEDULED) */
   int workstation_nb;
@@ -121,11 +124,18 @@ void __SD_task_just_done(SD_task_t task);
 
 /* Functions to test if the task is in a given state. */
 
-/* Returns whether the given task is scheduled or ready. */
-static XBT_INLINE int __SD_task_is_scheduled_or_ready(SD_task_t task)
+/* Returns whether the given task is scheduled or runnable. */
+static XBT_INLINE int __SD_task_is_scheduled_or_runnable(SD_task_t task)
 {
   return task->state_set == sd_global->scheduled_task_set ||
-    task->state_set == sd_global->ready_task_set;
+    task->state_set == sd_global->runnable_task_set;
+}
+
+/* Returns whether the given task is scheduled or runnable. */
+static XBT_INLINE int __SD_task_is_schedulable_or_done(SD_task_t task)
+{
+  return task->state_set == sd_global->schedulable_task_set ||
+    task->state_set == sd_global->done_task_set;
 }
 
 /* Returns whether the state of the given task is SD_NOT_SCHEDULED. */
@@ -134,16 +144,22 @@ static XBT_INLINE int __SD_task_is_not_scheduled(SD_task_t task)
   return task->state_set == sd_global->not_scheduled_task_set;
 }
 
+/* Returns whether the state of the given task is SD_SCHEDULED. */
+static XBT_INLINE int __SD_task_is_schedulable(SD_task_t task)
+{
+  return task->state_set == sd_global->schedulable_task_set;
+}
+
 /* Returns whether the state of the given task is SD_SCHEDULED. */
 static XBT_INLINE int __SD_task_is_scheduled(SD_task_t task)
 {
   return task->state_set == sd_global->scheduled_task_set;
 }
 
-/* Returns whether the state of the given task is SD_READY. */
-static XBT_INLINE int __SD_task_is_ready(SD_task_t task)
+/* Returns whether the state of the given task is SD_RUNNABLE. */
+static XBT_INLINE int __SD_task_is_runnable(SD_task_t task)
 {
-  return task->state_set == sd_global->ready_task_set;
+  return task->state_set == sd_global->runnable_task_set;
 }
 
 /* Returns whether the state of the given task is SD_IN_FIFO. */
@@ -152,10 +168,10 @@ static XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task)
   return task->state_set == sd_global->in_fifo_task_set;
 }
 
-/* Returns whether the state of the given task is SD_READY or SD_IN_FIFO. */
-static XBT_INLINE int __SD_task_is_ready_or_in_fifo(SD_task_t task)
+/* Returns whether the state of the given task is SD_RUNNABLE or SD_IN_FIFO. */
+static XBT_INLINE int __SD_task_is_runnable_or_in_fifo(SD_task_t task)
 {
-  return task->state_set == sd_global->ready_task_set ||
+  return task->state_set == sd_global->runnable_task_set ||
     task->state_set == sd_global->in_fifo_task_set;
 }