commiting some more automatic source patching stuff, and renamed some of the

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

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 243a9e0..447802e 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -13,6 +13,7 @@
 #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");
@@ -80,10 +81,11 @@ 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;
@@ -97,6 +99,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 */
@@ -113,7 +119,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);
 
@@ -121,6 +128,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. */
 
@@ -128,14 +136,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;
+      task->state_set == sd_global->done_task_set;
 }
 
 /* Returns whether the state of the given task is SD_NOT_SCHEDULED. */
@@ -172,7 +180,7 @@ static XBT_INLINE int __SD_task_is_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->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. */