X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e9b6e88f6c2daa87a9f5370596e5acc7f73fc6a..985adefb9840db3a67c9d92856e861baa8a7b032:/include/simdag/datatypes.h diff --git a/include/simdag/datatypes.h b/include/simdag/datatypes.h index 0ce3b00e15..f80d5ef6df 100644 --- a/include/simdag/datatypes.h +++ b/include/simdag/datatypes.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006, 2008-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -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,7 +66,7 @@ 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_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */ @@ -88,4 +89,12 @@ typedef enum { } e_SD_task_kind_t; +/** @brief Storage datatype + @ingroup SD_datatypes_management + + TODO PV: comment it ! + + @see SD_storage_management */ +typedef xbt_dictelm_t SD_storage_t; + #endif