#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
/* ******************************** 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
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 ************************************ */
*/
typedef struct msg_task *msg_task_t;
+/* ******************************** VM ************************************* */
+typedef struct msg_vm *msg_vm_t;
+
+typedef enum {
+ msg_vm_state_suspended, msg_vm_state_running, msg_vm_state_migrating
+} e_msg_vm_state_t;
+
+typedef struct msg_vm {
+ char *name;
+ s_xbt_swag_hookup_t all_vms_hookup;
+ s_xbt_swag_hookup_t host_vms_hookup;
+ xbt_dynar_t processes;
+ e_msg_vm_state_t state;
+ msg_host_t location;
+ int coreAmount;
+} s_msg_vm_t;
/* ******************************** File ************************************ */
typedef struct simdata_file *simdata_file_t;
*/
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;