X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb91af44a1bd7e5f331686df25d5fe80ff571a43..12d885f5614ca27378809979c732faa7cb0413e8:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 55a22d6346..7cf96e6e22 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -70,6 +70,9 @@ typedef struct simdata_process { char **argv; /* arguments table if any */ int argc; /* arguments number if any */ MSG_error_t last_errno; /* the last value returned by a MSG_function */ + + msg_vm_t vm; /* virtual machine the process is in */ + void* data; /* user data */ } s_simdata_process_t, *simdata_process_t; @@ -90,6 +93,19 @@ typedef struct msg_comm { MSG_error_t status; /* status of the communication once finished */ } s_msg_comm_t; +typedef enum { + msg_vm_state_suspended, msg_vm_state_running, msg_vm_state_migrating +} e_msg_vm_state_t; + +typedef struct msg_vm { + 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; + m_host_t location; + int coreAmount; +} s_msg_vm_t; + /************************** Global variables ********************************/ typedef struct MSG_Global { xbt_fifo_t host; @@ -101,6 +117,7 @@ typedef struct MSG_Global { unsigned long int sent_msg; /* Total amount of messages sent during the simulation */ void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst); void_f_pvoid_t process_data_cleanup; + xbt_swag_t vms; } s_MSG_Global_t, *MSG_Global_t; /*extern MSG_Global_t msg_global;*/ @@ -131,7 +148,6 @@ void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name, xbt_main_func_t code, void *data, const char *hostname, double kill_time, int argc, char **argv, xbt_dict_t properties); -void MSG_process_kill_from_SIMIX(smx_process_t p); void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size); void _MSG_action_init(void);