X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d44e911ae45609418de22c72114e85c4e031fcf4..0445b0862c323d8285fba620d5137a0891527914:/include/msg/datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index d4e254bf52..e036fc45cf 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -73,8 +73,8 @@ typedef struct msg_task {
   char *name;                   /**< @brief task name if any */
   simdata_task_t simdata;       /**< @brief simulator data */
   void *data;                   /**< @brief user data */
-#ifdef HAVE_TRACING
   long long int counter;        /* task unique identifier for instrumentation */
+#ifdef HAVE_TRACING
   char *category;               /* task category for instrumentation */
 #endif
 } s_msg_task_t;
@@ -99,20 +99,18 @@ static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){
 /** ******************************** File ************************************ */
 
 /** @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;
-
+*  @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;
@@ -140,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){