Rename the SD_READY (all dependencies are satisfied and task is

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

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 6739753..80b6b70 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2007-2009 Da SimGrid Team.  All rights reserved.           */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -36,7 +37,7 @@ typedef struct SD_global {
   /* task state sets */
   xbt_swag_t not_scheduled_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;
@@ -72,12 +73,13 @@ typedef struct SD_task {
   e_SD_task_state_t state;
   void *data;                   /* user data */
   char *name;
+  int kind;
   double amount;
   double remains;
   double start_time;
   double finish_time;
   surf_action_t surf_action;
-  unsigned short watch_points;
+  unsigned short watch_points; /* bit field xor()ed with masks */
 
   int fifo_checked;             /* used by SD_task_just_done to make sure we evaluate
                                    the task only once */
@@ -85,6 +87,7 @@ typedef struct SD_task {
   /* dependencies */
   xbt_dynar_t tasks_before;
   xbt_dynar_t tasks_after;
+  unsigned int unsatisfied_dependencies;
 
   /* scheduling parameters (only exist in state SD_SCHEDULED) */
   int workstation_nb;
@@ -119,11 +122,11 @@ 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 state of the given task is SD_NOT_SCHEDULED. */
@@ -139,9 +142,9 @@ static XBT_INLINE int __SD_task_is_scheduled(SD_task_t task)
 }
 
 /* Returns whether the state of the given task is SD_READY. */
-static XBT_INLINE int __SD_task_is_ready(SD_task_t task)
+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. */
@@ -151,9 +154,9 @@ static XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task)
 }
 
 /* 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)
+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;
 }