#include "xbt/dict.h"
#include "xbt/config.h"
#include "instr/instr_private.h"
-
SG_BEGIN_DECL()
/**************** datatypes **********************************/
smx_action_t comm; /* SIMIX modeling of communication */
double message_size; /* Data size */
double computation_amount; /* Computation size */
- m_process_t sender;
- m_process_t receiver;
- m_host_t source;
+ msg_process_t sender;
+ msg_process_t receiver;
+ msg_host_t source;
double priority;
double rate;
int isused; /* Indicates whether the task is used in SIMIX currently */
/******************************* Process *************************************/
typedef struct simdata_process {
- m_host_t m_host; /* the host on which the process is running */
+ msg_host_t m_host; /* the host on which the process is running */
int PID; /* used for debugging purposes */
int PPID; /* The parent PID */
- m_host_t put_host; /* used for debugging purposes */
+ msg_host_t put_host; /* used for debugging purposes */
#ifdef MSG_USE_DEPRECATED
m_channel_t put_channel; /* used for debugging purposes */
#endif
smx_action_t waiting_action;
- m_task_t waiting_task;
+ msg_task_t waiting_task;
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_error_t last_errno; /* the last value returned by a MSG_function */
msg_vm_t vm; /* virtual machine the process is in */
const char *name;
xbt_main_func_t code;
void *data;
- m_host_t m_host;
+ msg_host_t m_host;
int argc;
char **argv;
double kill_time;
typedef struct msg_comm {
smx_action_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
- m_task_t task_sent; /* task sent (NULL for the receiver) */
- m_task_t *task_received; /* where the task will be received (NULL for the sender) */
- MSG_error_t status; /* status of the communication once finished */
+ msg_task_t task_sent; /* task sent (NULL for the receiver) */
+ msg_task_t *task_received; /* where the task will be received (NULL for the sender) */
+ 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 {
+ 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;
- m_host_t location;
+ msg_host_t location;
int coreAmount;
} s_msg_vm_t;
-
+*/
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
int PID;
int session;
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 (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst);
void_f_pvoid_t process_data_cleanup;
xbt_swag_t vms;
} s_MSG_Global_t, *MSG_Global_t;
# define MSG_RETURN(val) return(val)
#endif
-m_host_t __MSG_host_create(smx_host_t workstation);
-void __MSG_host_destroy(m_host_t host);
+msg_host_t __MSG_host_create(smx_host_t workstation);
+void __MSG_host_destroy(msg_host_priv_t host);
void __MSG_display_process_status(void);
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);
+ char **argv, xbt_dict_t properties, int auto_restart);
void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size);
void _MSG_action_init(void);
void _MSG_action_exit(void);
+void MSG_post_create_environment(void);
+
+/********** Tracing **********/
+/* declaration of instrumentation functions from msg_task_instr.c */
+void TRACE_msg_set_task_category(msg_task_t task, const char *category);
+void TRACE_msg_task_create(msg_task_t task);
+void TRACE_msg_task_execute_start(msg_task_t task);
+void TRACE_msg_task_execute_end(msg_task_t task);
+void TRACE_msg_task_destroy(msg_task_t task);
+void TRACE_msg_task_get_start(void);
+void TRACE_msg_task_get_end(double start_time, msg_task_t task);
+int TRACE_msg_task_put_start(msg_task_t task); //returns TRUE if the task_put_end must be called
+void TRACE_msg_task_put_end(void);
+
+/* declaration of instrumentation functions from msg_process_instr.c */
+char *instr_process_id (msg_process_t proc, char *str, int len);
+char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len);
+void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host,
+ msg_host_t new_host);
+void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host);
+void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host);
+void TRACE_msg_process_kill(msg_process_t process);
+void TRACE_msg_process_suspend(msg_process_t process);
+void TRACE_msg_process_resume(msg_process_t process);
+void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c
+void TRACE_msg_process_sleep_out(msg_process_t process);
+void TRACE_msg_process_end(msg_process_t process);
+
+/* declaration of instrumentation functions from instr_msg_vm.c */
+char *instr_vm_id (msg_vm_t vm, char *str, int len);
+char *instr_vm_id_2 (const char *vm_name, char *str, int len);
+void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
+ msg_host_t new_host);
+void TRACE_msg_vm_create (const char *vm_name, msg_host_t host);
+void TRACE_msg_vm_kill(msg_vm_t process);
+void TRACE_msg_vm_suspend(msg_vm_t vm);
+void TRACE_msg_vm_resume(msg_vm_t vm);
+void TRACE_msg_vm_sleep_in(msg_vm_t vm);
+void TRACE_msg_vm_sleep_out(msg_vm_t vm);
+void TRACE_msg_vm_end(msg_vm_t vm);
+
SG_END_DECL()
#endif
