cleanups and simplifications to our build system

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

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index d4e254b..3739b2f 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -9,7 +9,6 @@
 #include "xbt/misc.h"
 #include "xbt/lib.h"
 #include "simgrid/simix.h"
-#include "simgrid_config.h"     // for HAVE_TRACING
 
 SG_BEGIN_DECL()
 
@@ -51,6 +50,7 @@ typedef struct msg_host_priv {
   int        dp_enabled;
   xbt_dict_t dp_objs;
   double     dp_updated_by_deleted_tasks;
+  int        is_migrating;
 
   xbt_dict_t affinity_mask_db;
 
@@ -73,10 +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 */
   char *category;               /* task category for instrumentation */
-#endif
 } s_msg_task_t;
 
 /** @brief Task datatype.
@@ -99,20 +97,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 +136,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){
@@ -154,10 +150,8 @@ typedef struct simdata_gpu_task *simdata_gpu_task_t;
 typedef struct msg_gpu_task {
   char *name;                   /**< @brief task name if any */
   simdata_gpu_task_t simdata;       /**< @brief simulator data */
-#ifdef HAVE_TRACING
   long long int counter;        /* task unique identifier for instrumentation */
   char *category;               /* task category for instrumentation */
-#endif
 } s_msg_gpu_task_t;
 
 /** @brief GPU task datatype.