X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48404c66fc4d8248308db1d1398cb79a6763077e..4e78565ea6b354a0e6250a87b483f909665a0ac3:/include/msg/datatypes.h diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index 0536dbb264..aab5e22c95 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -46,14 +46,13 @@ 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 xbt_lib_get_level(host, MSG_HOST_LEVEL); + return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL); } @@ -81,22 +80,13 @@ typedef struct msg_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 { - const 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; +/* ******************************** VM ************************************* */ +typedef msg_host_t msg_vm_t; +typedef msg_host_priv_t msg_vm_priv_t; + +static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){ + return xbt_lib_get_level(vm, MSG_HOST_LEVEL); +} /* ******************************** File ************************************ */ typedef struct simdata_file *simdata_file_t;