X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ce8957cfe6f904f244fdd79731800f0c61e50b0..a57d8d507653b5c412c4ac94c1634b9c0f6278e4:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index f72dd97e3e..2ac72296c4 100644 --- a/src/msg/private.h +++ b/src/msg/private.h @@ -10,7 +10,6 @@ #ifndef METASIMGRID_PRIVATE_H #define METASIMGRID_PRIVATE_H -#include #include "msg/msg.h" #include "simix/simix.h" #include "surf/surf.h" @@ -18,85 +17,81 @@ #include "xbt/dynar.h" #include "xbt/swag.h" #include "xbt/dict.h" -#include "xbt/context.h" #include "xbt/config.h" SG_BEGIN_DECL() /**************** datatypes **********************************/ - /* this structure represents a mailbox */ -typedef struct s_msg_mailbox -{ - char* alias; /* the key of the mailbox in the global dictionary */ - xbt_fifo_t tasks; /* the list of the tasks in the mailbox */ - smx_cond_t cond; /* the condition on the mailbox */ - char* hostname; /* the name of the host containing the mailbox */ -}s_msg_mailbox_t; - -typedef struct simdata_host -{ - smx_host_t smx_host; /* SURF modeling */ - struct s_msg_mailbox** mailboxes; /* mailboxes to store msg tasks of of the host */ - smx_mutex_t mutex; /* mutex to access the host */ -}s_simdata_host_t; + typedef struct s_msg_mailbox { + char *alias; /* the key of the mailbox in the global dictionary */ + smx_cond_t cond; /* the condition on the mailbox */ + smx_rdv_t rdv; /* SIMIX rendez-vous point */ + } s_msg_mailbox_t; + + typedef struct simdata_host { + smx_host_t smx_host; /* SURF modeling */ + struct s_msg_mailbox **mailboxes; /* mailboxes to store msg tasks of of the host */ + smx_mutex_t mutex; /* mutex to access the host */ + } s_simdata_host_t; /********************************* Task **************************************/ -typedef struct simdata_task { - smx_action_t compute; /* SURF modeling of computation */ - smx_action_t comm; /* SURF modeling of communication */ - double message_size; /* Data size */ - double computation_amount; /* Computation size */ - smx_cond_t cond; - smx_mutex_t mutex; /* Task mutex */ - m_process_t sender; - m_process_t receiver; - m_host_t source; - double priority; - double rate; - int refcount ; + typedef struct simdata_task { + smx_action_t compute; /* SURF modeling of computation */ + smx_comm_t comm; /* SIMIX communication */ + double message_size; /* Data size */ + double computation_amount; /* Computation size */ + smx_cond_t cond; + smx_mutex_t mutex; /* Task mutex */ + m_process_t sender; + m_process_t receiver; + m_host_t source; + double priority; + double rate; + int refcount; /******* Parallel Tasks Only !!!! *******/ - int host_nb; - smx_host_t *host_list; - double *comp_amount; - double *comm_amount; -} s_simdata_task_t; + int host_nb; + smx_host_t *host_list; + double *comp_amount; + double *comm_amount; + } s_simdata_task_t; /******************************* Process *************************************/ -typedef struct simdata_process { - m_host_t m_host; /* the host on which the process is running */ - smx_process_t s_process; - int PID; /* used for debugging purposes */ - int PPID; /* The parent PID */ - m_host_t put_host; /* used for debugging purposes */ - m_channel_t put_channel; /* used for debugging purposes */ - m_task_t waiting_task; - int argc; /* arguments number if any */ - char **argv; /* arguments table if any */ - MSG_error_t last_errno; /* the last value returned by a MSG_function */ -} s_simdata_process_t; - -typedef struct process_arg { - const char *name; - xbt_main_func_t code; - void *data; - m_host_t m_host; - int argc; - char **argv; - double kill_time; -} s_process_arg_t, *process_arg_t; + typedef struct simdata_process { + m_host_t m_host; /* the host on which the process is running */ + smx_process_t s_process; + int PID; /* used for debugging purposes */ + int PPID; /* The parent PID */ + m_host_t put_host; /* used for debugging purposes */ + m_channel_t put_channel; /* used for debugging purposes */ + smx_action_t waiting_action; + m_task_t waiting_task; + int argc; /* arguments number if any */ + char **argv; /* arguments table if any */ + MSG_error_t last_errno; /* the last value returned by a MSG_function */ + } s_simdata_process_t; + + typedef struct process_arg { + const char *name; + xbt_main_func_t code; + void *data; + m_host_t m_host; + int argc; + char **argv; + double kill_time; + } s_process_arg_t, *process_arg_t; /************************** Global variables ********************************/ -typedef struct MSG_Global { - xbt_fifo_t host; - xbt_fifo_t process_list; - int max_channel; - int PID; - int session; - unsigned long int sent_msg; /* Total amount of messages sent during the simulation */ -} s_MSG_Global_t, *MSG_Global_t; + typedef struct MSG_Global { + xbt_fifo_t host; + xbt_fifo_t process_list; + int max_channel; + int PID; + int session; + unsigned long int sent_msg; /* Total amount of messages sent during the simulation */ + } s_MSG_Global_t, *MSG_Global_t; /*extern MSG_Global_t msg_global;*/ XBT_PUBLIC_DATA(MSG_Global_t) msg_global; @@ -112,17 +107,21 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global; #define CHECK_HOST() xbt_assert1(SIMIX_host_get_state(SIMIX_host_self())==1,\ "Host failed, you cannot call this function. (state=%d)",SIMIX_host_get_state(SIMIX_host_self())) -m_host_t __MSG_host_create(smx_host_t workstation, void *data); + m_host_t __MSG_host_create(smx_host_t workstation, void *data); + + void __MSG_host_destroy(m_host_t host); -void __MSG_host_destroy(m_host_t host); + void __MSG_display_process_status(void); -void __MSG_display_process_status(void); + void __MSG_process_cleanup(void *arg); + void *_MSG_process_create_from_SIMIX(const char *name, + xbt_main_func_t code, void *data, + char *hostname, int argc, + char **argv, xbt_dict_t properties); + void _MSG_process_kill_from_SIMIX(void *p); -void __MSG_process_cleanup(void *arg); -void *_MSG_process_create_from_SIMIX(const char *name, - xbt_main_func_t code, void *data, - char * hostname, int argc, char **argv, xbt_dict_t properties); -void _MSG_process_kill_from_SIMIX(void *p); + void _MSG_action_init(void); + void _MSG_action_exit(void); SG_END_DECL() #endif