X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d0eaea75f444b5ac20edfca6d4ce04cee7307e7..96f99f2c43f129472ec7603caef3e370be91e13e:/src/simdag/private.h

diff --git a/src/simdag/private.h b/src/simdag/private.h
index c86ff69b8d..4ac0f2f0d1 100644
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -2,36 +2,80 @@
 #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 SD_CHECK_INIT_DONE() xbt_assert0(sd_global != NULL, "Call SD_init() first")
 
 /* Global variables */
 
-typedef struct SG_global {
+typedef struct SD_global {
   xbt_dict_t workstations; /* workstation list */
   int workstation_count; /* number of workstations */
-} s_SG_global_t, *SG_global_t;
+  xbt_dict_t links; /* link list */
+  xbt_dynar_t tasks; /* task list */
+  
+  /* task state sets */
+  xbt_swag_t not_scheduled_task_set;
+  xbt_swag_t scheduled_task_set;
+  xbt_swag_t running_task_set;
+  xbt_swag_t done_task_set;
+  xbt_swag_t failed_task_set;
+} s_SD_global_t, *SD_global_t;
 
-extern SG_global_t sg_global;
+extern SD_global_t sd_global;
 
 /* Link private data */
-typedef struct SG_link_data {
-  void* surf_link; /* surf object */
-
-} s_SG_link_data_t;
+typedef struct SD_link_data {
+  void *surf_link; /* surf object */
+} s_SD_link_data_t;
 
 /* Workstation private data */
-typedef struct SG_workstation_data {
-  void* surf_workstation; /* surf object */
-  /* TODO: route */
-} s_SG_workstation_data_t;
+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 */
+typedef struct SD_task {
+  s_xbt_swag_hookup_t state_hookup;
+  xbt_swag_t state_set;
+  void *data; /* user data */
+  char *name;
+  double amount;
+  surf_action_t surf_action;
+  unsigned short watch_points;
+
+  /* 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_t;
+
+/* SimDag private functions */
 
-/* Private functions */
+SD_link_t __SD_link_create(void *surf_link, void *data);
+void __SD_link_destroy(void *link);
 
-SG_link_t __SG_link_create(const char *name, void *surf_link, void *data);
-void __SG_link_destroy(SG_link_t link);
+SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data);
+void __SD_workstation_destroy(void *workstation);
 
-SG_workstation_t __SG_workstation_create(const char *name, void *surf_workstation, void *data);
-void __SG_workstation_destroy(SG_workstation_t workstation);
+surf_action_t __SD_task_run(SD_task_t task);
 
 #endif