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

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 8d76354346..a40e51c382 100644
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -14,20 +14,20 @@
 /* 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
-				  and mallocated only once */
-
-  int watch_point_reached; /* has a task just reached a watch point? */
-  
+  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
+                                   and mallocated only once */
+
+  int watch_point_reached;      /* has a task just reached a watch point? */
+
   /* task state sets */
   xbt_swag_t not_scheduled_task_set;
   xbt_swag_t scheduled_task_set;
@@ -37,31 +37,35 @@ typedef struct SD_global {
   xbt_swag_t done_task_set;
   xbt_swag_t failed_task_set;
 
+  int task_number;
+
 } s_SD_global_t, *SD_global_t;
 
 extern SD_global_t sd_global;
 
 /* Link */
 typedef struct SD_link {
-  void *surf_link; /* surf object */
-  void *data; /* user data */
+  void *surf_link;              /* surf object */
+  void *data;                   /* user data */
+  e_SD_link_sharing_policy_t sharing_policy;
 } s_SD_link_t;
 
 /* Workstation */
 typedef struct SD_workstation {
-  void *surf_workstation; /* surf object */
-  void *data; /* user data */
+  void *surf_workstation;       /* surf object */
+  void *data;                   /* user data */
   e_SD_workstation_access_mode_t access_mode;
 
-  xbt_fifo_t task_fifo; /* only used in sequential mode */
-  SD_task_t current_task; /* only used in sequential mode */
+  xbt_fifo_t task_fifo;         /* only used in sequential mode */
+  SD_task_t current_task;       /* only used in sequential mode */
 } s_SD_workstation_t;
 
 /* Task */
 typedef struct SD_task {
   s_xbt_swag_hookup_t state_hookup;
   xbt_swag_t state_set;
-  void *data; /* user data */
+  e_SD_task_state_t state;
+  void *data;                   /* user data */
   char *name;
   double amount;
   double remains;
@@ -70,10 +74,8 @@ typedef struct SD_task {
   surf_action_t surf_action;
   unsigned short watch_points;
 
-  int state_changed; /* used only by SD_simulate, to make sure we put
-			the task only once in the returning array */
-  int fifo_checked; /* used by SD_task_just_done to make sure we evaluate
-		       the task only once */
+  int fifo_checked;             /* used by SD_task_just_done to make sure we evaluate
+                                   the task only once */
 
   /* dependencies */
   xbt_dynar_t tasks_before;
@@ -81,7 +83,7 @@ typedef struct SD_task {
 
   /* scheduling parameters (only exist in state SD_SCHEDULED) */
   int workstation_nb;
-  SD_workstation_t *workstation_list; /* surf workstations */
+  SD_workstation_t *workstation_list;   /* surf workstations */
   double *computation_amount;
   double *communication_amount;
   double rate;
@@ -110,43 +112,49 @@ 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);
 
-/* Functions to test if the task is in a given state.
-   These functions are faster than using SD_task_get_state() */
+/* Functions to test if the task is in a given state. */
 
 /* Returns whether the given task is scheduled or ready. */
-static _XBT_INLINE int __SD_task_is_scheduled_or_ready(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_scheduled_or_ready(SD_task_t task)
+{
   return task->state_set == sd_global->scheduled_task_set ||
     task->state_set == sd_global->ready_task_set;
 }
 
 /* Returns whether the state of the given task is SD_NOT_SCHEDULED. */
-static _XBT_INLINE int __SD_task_is_not_scheduled(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_not_scheduled(SD_task_t task)
+{
   return task->state_set == sd_global->not_scheduled_task_set;
 }
 
 /* Returns whether the state of the given task is SD_SCHEDULED. */
-static _XBT_INLINE int __SD_task_is_scheduled(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_scheduled(SD_task_t task)
+{
   return task->state_set == sd_global->scheduled_task_set;
 }
 
 /* Returns whether the state of the given task is SD_READY. */
-static _XBT_INLINE int __SD_task_is_ready(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_ready(SD_task_t task)
+{
   return task->state_set == sd_global->ready_task_set;
 }
 
 /* Returns whether the state of the given task is SD_IN_FIFO. */
-static _XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task)
+{
   return task->state_set == sd_global->in_fifo_task_set;
 }
 
 /* Returns whether the state of the given task is SD_READY or SD_IN_FIFO. */
-static _XBT_INLINE int __SD_task_is_ready_or_in_fifo(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_ready_or_in_fifo(SD_task_t task)
+{
   return task->state_set == sd_global->ready_task_set ||
     task->state_set == sd_global->in_fifo_task_set;
 }
 
 /* Returns whether the state of the given task is SD_RUNNING. */
-static _XBT_INLINE int __SD_task_is_running(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_running(SD_task_t task)
+{
   return task->state_set == sd_global->running_task_set;
 }