X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df12bbc75c274351f3b3a628740e0b3270f08e18..cb83f4f46c751c4dc32a4c9569e3626915803894:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 2b3e69b60a..3c6c04db3a 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -16,7 +16,6 @@ #include "xbt/dict.h" #include "xbt/config.h" #include "instr/instr_private.h" - SG_BEGIN_DECL() /**************** datatypes **********************************/ @@ -66,10 +65,10 @@ typedef struct simdata_process { 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 */ @@ -88,9 +87,9 @@ typedef struct process_arg { 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 { @@ -115,7 +114,7 @@ typedef struct MSG_Global { 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, msg_process_t src, msg_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; @@ -153,5 +152,7 @@ void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_si void _MSG_action_init(void); void _MSG_action_exit(void); +void MSG_post_create_environment(void); + SG_END_DECL() #endif