X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2405c1a902dc830946d96db7e46d9c1d6d489bc..eed33b5980ef79e3f979b80564fbd5314c47902d:/include/simdag/datatypes.h diff --git a/include/simdag/datatypes.h b/include/simdag/datatypes.h index e33ae0251a..40fa48b682 100644 --- a/include/simdag/datatypes.h +++ b/include/simdag/datatypes.h @@ -6,6 +6,7 @@ #ifndef SIMDAG_DATATYPES_H #define SIMDAG_DATATYPES_H +#include "xbt/dict.h" /** @brief Workstation datatype @ingroup SD_datatypes_management @@ -15,7 +16,7 @@ resource with computing capabilities and has a name. @see SD_workstation_management */ -typedef struct SD_workstation *SD_workstation_t; +typedef xbt_dictelm_t SD_workstation_t; /** @brief Workstation access mode @ingroup SD_datatypes_management @@ -65,9 +66,9 @@ typedef struct SD_task *SD_task_t; @see SD_task_management */ typedef enum { SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */ - SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_READY as soon as its dependencies are satisfied */ + SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */ SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function - SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */ + SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */ SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */ SD_IN_FIFO = 0x0008, /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */ SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */