Some more cleanup in smx_context_raw.

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

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 80b6b70..fc7026a 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -13,20 +13,16 @@
 #include "simdag/simdag.h"
 #include "simdag/datatypes.h"
 #include "surf/surf.h"
+#include <stdbool.h>
 
 #define SD_INITIALISED() (sd_global != NULL)
-#define SD_CHECK_INIT_DONE() xbt_assert0(SD_INITIALISED(), "Call SD_init() first");
+#define SD_CHECK_INIT_DONE() xbt_assert(SD_INITIALISED(), "Call SD_init() first");
 
 /* Global variables */
 
 typedef struct SD_global {
-  xbt_dict_t workstations;      /* workstation dictionary */
-  int workstation_count;        /* number of workstations */
   SD_workstation_t *workstation_list;   /* array of workstations, created only if
                                            necessary in SD_workstation_get_list */
-
-  xbt_dict_t links;             /* links */
-  int link_count;               /* number of links */
   SD_link_t *link_list;         /* array of links, created only if
                                    necessary in SD_link_get_list */
   SD_link_t *recyclable_route;  /* array returned by SD_route_get_list
@@ -36,6 +32,7 @@ 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 runnable_task_set;
   xbt_swag_t in_fifo_task_set;
@@ -79,15 +76,17 @@ typedef struct SD_task {
   double start_time;
   double finish_time;
   surf_action_t surf_action;
-  unsigned short watch_points; /* bit field xor()ed with masks */
+  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 */
+  int marked;                   /* used to check if the task DAG has some cycle*/
 
   /* 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;
@@ -95,6 +94,10 @@ typedef struct SD_task {
   double *computation_amount;
   double *communication_amount;
   double rate;
+
+#ifdef HAVE_TRACING
+  char *category;               /* sd task category for instrumentation */
+#endif
 } s_SD_task_t;
 
 /* Task dependencies */
@@ -111,7 +114,8 @@ typedef struct SD_dependency {
 SD_link_t __SD_link_create(void *surf_link, void *data);
 void __SD_link_destroy(void *link);
 
-SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data);
+SD_workstation_t __SD_workstation_create(void *surf_workstation,
+                                         void *data);
 void __SD_workstation_destroy(void *workstation);
 int __SD_workstation_is_busy(SD_workstation_t workstation);
 
@@ -119,6 +123,7 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state);
 void __SD_task_really_run(SD_task_t task);
 int __SD_task_try_to_run(SD_task_t task);
 void __SD_task_just_done(SD_task_t task);
+bool acyclic_graph_detail(xbt_dynar_t dag);
 
 /* Functions to test if the task is in a given state. */
 
@@ -126,7 +131,14 @@ void __SD_task_just_done(SD_task_t task);
 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->runnable_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. */
@@ -135,13 +147,19 @@ 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. */
+/* 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->runnable_task_set;
@@ -153,11 +171,11 @@ 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. */
+/* 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->runnable_task_set ||
-    task->state_set == sd_global->in_fifo_task_set;
+      task->state_set == sd_global->in_fifo_task_set;
 }
 
 /* Returns whether the state of the given task is SD_RUNNING. */