Merge commit '045db1657e870c721be490b411868f4181a12ced' into surf++

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

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 8ecd1ca..f0b1573 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2013. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -27,7 +28,7 @@ SG_BEGIN_DECL()
 typedef struct s_smx_rvpoint *msg_mailbox_t;
 
 /* ******************************** Environment ************************************ */
-typedef struct s_as *msg_as_t;
+typedef struct As *msg_as_t;
 
 /* ******************************** Host ************************************ */
 
@@ -102,13 +103,13 @@ typedef struct msg_vm {
 /* ******************************** File ************************************ */
 typedef struct simdata_file *simdata_file_t;
 
-typedef struct s_file_info {
-  size_t size;
+typedef struct s_msg_file_info {
+  sg_storage_size_t size;
   char* mount_point;
   char* storageId;
   char* storage_type;
   char* content_type;
-} s_file_info_t, *msg_file_info_t;
+} s_msg_file_info_t, *msg_file_info_t;
 
 typedef struct msg_file {
   char *fullname;               /**< @brief file full name (path+name)*/
@@ -117,9 +118,9 @@ typedef struct msg_file {
 } 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;
@@ -129,22 +130,18 @@ typedef struct msg_file *msg_file_t;
 
 extern int MSG_STORAGE_LEVEL;
 
+/** @brief Storage datatype.
+ *  @ingroup msg_storage_management
+ *
+ *  You should consider this as an opaque object.
+ */
 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;
+typedef struct msg_storage_priv  {
+  // TODO PV: fill it (or not) !
+  void * dummy;
+} s_msg_storage_priv_t, *msg_storage_priv_t;
 
 /*************** Begin GPU ***************/
 typedef struct simdata_gpu_task *simdata_gpu_task_t;