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

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 4ac0f2f0d1..d8bf9f7cdb 100644
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -16,6 +16,7 @@ typedef struct SD_global {
   int workstation_count; /* number of workstations */
   xbt_dict_t links; /* link list */
   xbt_dynar_t tasks; /* task list */
+  int watch_point_reached; /* has a task just reached a watch point? */
   
   /* task state sets */
   xbt_swag_t not_scheduled_task_set;
@@ -23,28 +24,22 @@ typedef struct SD_global {
   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 SD_global_t sd_global;
 
-/* Link private data */
-typedef struct SD_link_data {
+/* Link */
+typedef struct SD_link {
   void *surf_link; /* surf object */
-} s_SD_link_data_t;
+  void *data; /* user data */
+} s_SD_link_t;
 
-/* Workstation private data */
-typedef struct SD_workstation_data {
+/* Workstation */
+typedef struct SD_workstation {
   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;
+  void *data; /* user data */
+} s_SD_workstation_t;
 
 /* Task */
 typedef struct SD_task {
@@ -68,6 +63,15 @@ typedef struct SD_task {
   double rate;
 } s_SD_task_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;
+
 /* SimDag private functions */
 
 SD_link_t __SD_link_create(void *surf_link, void *data);