Do not require doxygen in maintainer mode

[simgrid.git] / src / simdag / private.h

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 8d76354..1e69f43 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -37,6 +37,8 @@ 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;
@@ -45,6 +47,7 @@ extern SD_global_t sd_global;
 typedef struct SD_link {
   void *surf_link; /* surf object */
   void *data; /* user data */
+  e_SD_link_sharing_policy_t sharing_policy; 
 } s_SD_link_t;
 
 /* Workstation */
@@ -61,6 +64,7 @@ typedef struct SD_workstation {
 typedef struct SD_task {
   s_xbt_swag_hookup_t state_hookup;
   xbt_swag_t state_set;
+  e_SD_task_state_t state;
   void *data; /* user data */
   char *name;
   double amount;
@@ -70,8 +74,6 @@ 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 */
 
@@ -110,43 +112,42 @@ 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;
 }