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 b76e6c3..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.
@@ -138,7 +136,7 @@ typedef xbt_dictelm_t msg_storage_t;
 typedef s_xbt_dictelm_t s_msg_storage_t;
 
 typedef struct msg_storage_priv  {
-  const char *host;
+  const char *hostname;
   void *data;
 } s_msg_storage_priv_t, *msg_storage_priv_t;
 
@@ -152,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.