X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/662f44287e3fd62ebdf93b4c8173603dde9693b7..9e74a8baa9c785f592bf0694e43cc3fba79e3f17:/include/msg/datatypes.h diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index e69f229643..760a2d89e4 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -96,38 +96,21 @@ static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){ return (msg_vm_priv_t) xbt_lib_get_level(vm, MSG_HOST_LEVEL); } -/* ******************************** File ************************************ */ -//typedef struct simdata_file *simdata_file_t; -// -//typedef struct s_msg_file_info { -// sg_size_t size; -// char* mount_point; -// char* storageId; -// char* storage_type; -// char* content_type; -//} s_msg_file_info_t, *msg_file_info_t; -// -//typedef struct msg_file { -// char *fullname; /**< @brief file full name (path+name)*/ -// simdata_file_t simdata; /**< @brief simulator data */ -// msg_file_info_t info; -//} s_msg_file_t; -// -///** @brief File datatype. -// * @ingroup msg_file_management -// * -// * You should consider this as an opaque object. -// */ -// -//typedef struct msg_file *msg_file_t; -extern int MSG_FILE_LEVEL; -typedef struct simdata_file *simdata_file_t; +/** ******************************** File ************************************ */ +/** @brief File datatype. +* @ingroup msg_file_management +* +* You should consider this as an opaque object. +*/ typedef xbt_dictelm_t msg_file_t; typedef s_xbt_dictelm_t s_msg_file_t; +extern int MSG_FILE_LEVEL; +typedef struct simdata_file *simdata_file_t; + typedef struct msg_file_priv { - const char *fullname; + char *fullpath; sg_size_t size; char* mount_point; char* storageId; @@ -155,8 +138,8 @@ typedef xbt_dictelm_t msg_storage_t; typedef s_xbt_dictelm_t s_msg_storage_t; typedef struct msg_storage_priv { - // TODO PV: fill it (or not) ! - void * dummy; + const char *hostname; + void *data; } s_msg_storage_priv_t, *msg_storage_priv_t; static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){