X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fb29ecfb181924366b859d2dc26304d05a0eb85d..d74b4977daa2266f5a80c90d906c01eff72b4d7d:/src/simdag/private.h

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 209556f110..028ca8a47f 100644
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -2,11 +2,12 @@
 #define SIMDAG_PRIVATE_H
 
 #include "xbt/dict.h"
+#include "xbt/dynar.h"
 #include "simdag/simdag.h"
 #include "simdag/datatypes.h"
 #include "surf/surf.h"
 
-#define CHECK_INIT_DONE() xbt_assert0(sd_global != NULL, "SD_init not called yet")
+#define SD_CHECK_INIT_DONE() xbt_assert0(sd_global != NULL, "Call SD_init() first")
 
 /* Global variables */
 
@@ -28,6 +29,15 @@ typedef struct SD_workstation_data {
   void *surf_workstation; /* surf object */
 } s_SD_workstation_data_t;
 
+/* Task dependencies */
+typedef struct SD_dependency {
+  char *name;
+  void *data;
+  SD_task_t src;
+  SD_task_t dst;
+  /* src must be finished before dst can start */
+} s_SD_dependency_t, *SD_dependency_t;
+
 /* Task private data */
 typedef struct SD_task_data {
   char *name;
@@ -36,8 +46,16 @@ typedef struct SD_task_data {
   surf_action_t surf_action;
   unsigned short watch_points;
 
-  /*  double remaining_amount;*/
-  /* TODO: dependencies */
+  /* dependencies */
+  xbt_dynar_t tasks_before;
+  xbt_dynar_t tasks_after;
+
+  /* scheduling parameters (only exist in state SD_SCHEDULED) */
+  int workstation_nb;
+  void **workstation_list; /* surf workstations */
+  double *computation_amount;
+  double *communication_amount;
+  double rate;
 } s_SD_task_data_t;
 
 /* Private functions */
@@ -48,4 +66,9 @@ void __SD_link_destroy(void *link);
 SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data);
 void __SD_workstation_destroy(void *workstation);
 
+void __SD_task_run(SD_task_t task);
+void __SD_task_destroy(SD_task_t task);
+void __SD_task_destroy_scheduling_data(SD_task_t task);
+void __SD_task_destroy_dependency(void *dependency);
+
 #endif