X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48404c66fc4d8248308db1d1398cb79a6763077e..2b859d7b5c2aed26d77af4b362ba4f3d39626a9a:/include/msg/datatypes.h diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index 0536dbb264..91310e9139 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -6,7 +6,6 @@ #ifndef MSG_DATATYPE_H #define MSG_DATATYPE_H #include "xbt/misc.h" -#include "xbt/file_stat.h" #include "xbt/lib.h" #include "simgrid/simix.h" #include "simgrid_config.h" // for HAVE_TRACING @@ -27,6 +26,8 @@ SG_BEGIN_DECL() * want to send your task, but only the name of this mailbox. */ typedef struct s_smx_rvpoint *msg_mailbox_t; +/* ******************************** Environment ************************************ */ +typedef struct s_as *msg_as_t; /* ******************************** Host ************************************ */ @@ -53,7 +54,7 @@ typedef struct msg_host_priv { } s_msg_host_priv_t, *msg_host_priv_t; static inline msg_host_priv_t MSG_host_priv(msg_host_t host){ - return xbt_lib_get_level(host, MSG_HOST_LEVEL); + return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL); } @@ -89,7 +90,7 @@ typedef enum { } e_msg_vm_state_t; typedef struct msg_vm { - const char *name; + char *name; s_xbt_swag_hookup_t all_vms_hookup; s_xbt_swag_hookup_t host_vms_hookup; xbt_dynar_t processes; @@ -102,8 +103,8 @@ typedef struct msg_vm { typedef struct simdata_file *simdata_file_t; typedef struct msg_file { - char *name; /**< @brief file name */ - simdata_file_t simdata; /**< @brief simulator data */ + char *fullname; /**< @brief file full name (path+name)*/ + simdata_file_t simdata; /**< @brief simulator data */ void *data; /**< @brief user data */ } s_msg_file_t; @@ -114,15 +115,6 @@ typedef struct msg_file { */ typedef struct msg_file *msg_file_t; - -/** @brief File datatype. - @ingroup msg_file_management - - You should consider this as an opaque object. - */ -typedef s_file_stat_t s_msg_stat_t, *msg_stat_t; - - /*************** Begin GPU ***************/ typedef struct simdata_gpu_task *simdata_gpu_task_t;