X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..9e8d76f5eb3db584150db55fc3929623188b6b08:/src/simdag/private.h

diff --git a/src/simdag/private.h b/src/simdag/private.h
index aab3cd6044..fc7026a6fa 100644
--- 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
@@ -84,6 +80,7 @@ typedef struct SD_task {
 
   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;
@@ -126,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. */