X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d0eaea75f444b5ac20edfca6d4ce04cee7307e7..b5b78d30ccd8b5e3658ae83c51dd7501be7c9f48:/include/simdag/datatypes.h diff --git a/include/simdag/datatypes.h b/include/simdag/datatypes.h index 1b1ad0beb0..571d1aa52f 100644 --- a/include/simdag/datatypes.h +++ b/include/simdag/datatypes.h @@ -1,47 +1,2 @@ -#ifndef SIMDAG_DATATYPES_H -#define SIMDAG_DATATYPES_H - -/* Link */ -typedef struct SG_link_data *SG_link_data_t; - -typedef struct SG_link { - SG_link_data_t sgdata; /* SG internal data */ - void *data; /* user data */ - char *name; - - /*double capacity;*/ - /*double current_bandwidth; - double current_latency;*/ -} s_SG_link_t, *SG_link_t; - -/* Workstation */ -typedef struct SG_workstation_data *SG_workstation_data_t; - -typedef struct SG_workstation { - SG_workstation_data_t sgdata; /* SG internal data */ - void *data; /* user data */ - char *name; - - /* double power; - double available_power;*/ -} s_SG_workstation_t, *SG_workstation_t; - -/* Task state */ -typedef enum { - SG_SCHEDULED, - SG_RUNNING, - SG_DONE, - SG_FAILED -} SG_task_state_t; - -/* Task */ -typedef struct SG_task { - void *data; - char *name; - /*double amount; - double remaining_amount;*/ - SG_task_state_t state; - /* TODO: dependencies + watch */ -} s_SG_task_t, *SG_task_t; - -#endif +#warning You should now include directly simgrid/simdag.h instead of simdag/datatypes.h +#include "simgrid/simdag.h"