Fix doxygen comments.

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

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 46281fe..53905bf 100644 (file)
--- 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 ************************************ */
 
@@ -101,27 +102,54 @@ 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 *name;                   /**< @brief file name */
-  simdata_file_t simdata;                /**< @brief simulator data  */
-  void *data;                   /**< @brief user data */
+  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.
+ *  @ingroup msg_file_management
+ *
+ *  You should consider this as an opaque object.
  */
+
 typedef struct msg_file *msg_file_t;
 
+/* ******************************** Storage ************************************ */
+/* TODO: PV: to comment */
 
-/** @brief File datatype.
-    @ingroup msg_file_management
+extern int MSG_STORAGE_LEVEL;
 
-    You should consider this as an opaque object.
+/** @brief Storage datatype.
+ *  @ingroup msg_storage_management
+ *
+ *  You should consider this as an opaque object.
  */
-typedef s_file_stat_t s_msg_stat_t, *msg_stat_t;
-
+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) !
+} */ s_msg_storage_priv_t, *msg_storage_priv_t;
+
+//typedef struct simdata_storage *simdata_storage_t;
+//
+//typedef struct msg_storage {
+//  char *name;
+//  simdata_storage_t simdata;    /**< @brief simulator data  */
+//  void *data;                   /**< @brief user data */
+//} s_msg_storage_t;
+//
+//typedef struct msg_storage *msg_storage_t;
 
 /*************** Begin GPU ***************/
 typedef struct simdata_gpu_task *simdata_gpu_task_t;