X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fc37c3e200f4abc0106904b78a62d4e5bde554c..e1125ee008d92c7f0bbebc9274d7f44829fa58f9:/src/simdag/private.h diff --git a/src/simdag/private.h b/src/simdag/private.h index 1fa4e299c2..d1d81385f0 100644 --- a/src/simdag/private.h +++ b/src/simdag/private.h @@ -73,8 +73,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 */ @@ -116,39 +114,39 @@ void __SD_task_just_done(SD_task_t task); /* 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; }