X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4abd3f271729beeff499da36267bfb274dd1f6d..04499946d1a382b5b5815d69b95b27dc78d36ed6:/include/msg/datatypes.h?ds=sidebyside

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index cedd660b20..d2bef83bc3 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -6,7 +6,7 @@
 #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
 
@@ -29,13 +29,7 @@ typedef struct s_smx_rvpoint *msg_mailbox_t;
 
 /* ******************************** Host ************************************ */
 
-typedef struct msg_host {
-  xbt_swag_t vms;
-  smx_host_t smx_host;          /**< SIMIX representation of this host   */
-#ifdef MSG_USE_DEPRECATED
-  msg_mailbox_t *mailboxes;     /**< the channels  */
-#endif
-} s_msg_host_t;
+extern int MSG_HOST_LEVEL;
 
 /** @brief Host datatype.
     @ingroup m_host_management
@@ -47,7 +41,21 @@ typedef struct msg_host {
     some <em>private data</em> that can be only accessed by local
     process.
  */
-typedef struct msg_host *msg_host_t;
+typedef xbt_dictelm_t msg_host_t;
+typedef s_xbt_dictelm_t s_msg_host_t;
+
+typedef struct msg_host_priv {
+  xbt_swag_t vms;
+#ifdef MSG_USE_DEPRECATED
+  msg_mailbox_t *mailboxes;     /**< the channels  */
+#endif
+} s_msg_host_priv_t, *msg_host_priv_t;
+
+static inline msg_host_priv_t MSG_host_priv(msg_host_t host){
+  return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL);
+}
+
+
 
 /* ******************************** Task ************************************ */
 
@@ -80,7 +88,7 @@ typedef enum {
 } e_msg_vm_state_t;
 
 typedef struct msg_vm {
-  const char *name;
+  char *name;
   s_xbt_swag_hookup_t all_vms_hookup;
   s_xbt_swag_hookup_t host_vms_hookup;
   xbt_dynar_t processes;
@@ -105,15 +113,6 @@ typedef struct msg_file {
  */
 typedef struct msg_file *msg_file_t;
 
-
-/** @brief File datatype.
-    @ingroup msg_file_management
-
-    You should consider this as an opaque object.
- */
-typedef s_file_stat_t s_msg_stat_t, *msg_stat_t;
-
-
 /*************** Begin GPU ***************/
 typedef struct simdata_gpu_task *simdata_gpu_task_t;