Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / msg / datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index c142420..c01b243 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -102,10 +102,19 @@ typedef struct msg_vm {
 /* ******************************** File ************************************ */
 typedef struct simdata_file *simdata_file_t;
 
+typedef struct s_file_info {
+  size_t size;
+  char* mount_point;
+  char* storageId;
+  char* storage_type;
+  char* content_type;
+} s_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  */
   void *data;                   /**< @brief user data */
+  msg_file_info_t info;
 } s_msg_file_t;
 
 /** @brief File datatype.
@@ -120,12 +129,8 @@ typedef struct msg_file *msg_file_t;
 typedef struct simdata_storage *simdata_storage_t;
 
 typedef struct msg_storage {
-  char *model;
-  char *content_type;
-  char *type_id;
-  size_t size;
-  xbt_dict_t properties;
-  simdata_storage_t simdata;                /**< @brief simulator data  */
+  char *name;
+  simdata_storage_t simdata;    /**< @brief simulator data  */
   void *data;                   /**< @brief user data */
 } s_msg_storage_t;