X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dacf5b5e81474fb89d8234b907f6f61b623983e..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/include/simgrid/msg.h?ds=sidebyside diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index cec06b7db2..93b95399a5 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -9,6 +9,7 @@ #include "xbt.h" #include "xbt/lib.h" +#include "simgrid/forward.h" #include "simgrid/simix.h" #include "simgrid/platf.h" @@ -29,7 +30,7 @@ SG_BEGIN_DECL() typedef struct s_smx_rvpoint *msg_mailbox_t; /* ******************************** Environment ************************************ */ -typedef struct As *msg_as_t; +typedef surf_As *msg_as_t; /* ******************************** Host ************************************ */ @@ -52,10 +53,7 @@ typedef struct s_msg_host_priv { int is_migrating; xbt_dict_t affinity_mask_db; - -#ifdef MSG_USE_DEPRECATED - msg_mailbox_t *mailboxes; /**< the channels */ -#endif + xbt_dynar_t file_descriptor_table; } s_msg_host_priv_t; /* ******************************** Task ************************************ */ @@ -102,6 +100,7 @@ typedef struct msg_file_priv { char* storageId; char* storage_type; char* content_type; + int desc_id; void *data; simdata_file_t simdata; } s_msg_file_priv_t, *msg_file_priv_t; @@ -179,19 +178,6 @@ typedef struct msg_comm *msg_comm_t; */ typedef struct s_smx_process *msg_process_t; -#ifdef MSG_USE_DEPRECATED - -/* Compatibility typedefs */ -typedef int m_channel_t; -typedef msg_gpu_task_t m_gpu_task_t; -typedef msg_host_t m_host_t; -typedef msg_process_t m_process_t; -typedef msg_task_t m_task_t; -typedef s_msg_gpu_task_t s_m_gpu_task_t; -typedef s_msg_host_t s_m_host_t; -typedef s_msg_task_t s_m_task_t; -#endif - /** @brief Return code of most MSG functions @ingroup msg_simulation @{ */ @@ -222,7 +208,7 @@ XBT_PUBLIC(void) MSG_config(const char *key, const char *value); * We allow to link against compiled versions that differ in the patch level. */ #define MSG_init(argc,argv) do { \ - sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\ + sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\ MSG_init_nocheck(argc,argv); \ } while (0) @@ -293,26 +279,24 @@ XBT_PUBLIC(msg_host_t) MSG_host_by_name(const char *name); #define MSG_get_host_by_name(n) MSG_host_by_name(n) /* Rewrite the old name into the new one transparently */ XBT_PUBLIC(msg_error_t) MSG_host_set_data(msg_host_t host, void *data); XBT_PUBLIC(void *) MSG_host_get_data(msg_host_t host); -XBT_PUBLIC(const char *) MSG_host_get_name(msg_host_t host); +/** \ingroup m_host_management + * + * \brief Return the name of the #msg_host_t. */ +#define MSG_host_get_name(host) sg_host_get_name(host) XBT_PUBLIC(void) MSG_host_on(msg_host_t host); XBT_PUBLIC(void) MSG_host_off(msg_host_t host); XBT_PUBLIC(msg_host_t) MSG_host_self(void); -XBT_PUBLIC(int) MSG_get_host_msgload(msg_host_t host); XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); XBT_PUBLIC(int) MSG_host_get_core_number(msg_host_t h); XBT_PUBLIC(xbt_swag_t) MSG_host_get_process_list(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_on(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_off(msg_host_t h); -XBT_PUBLIC(double) MSG_host_get_wattmin_at(msg_host_t host, int pstate); -XBT_PUBLIC(double) MSG_host_get_wattmax_at(msg_host_t host, int pstate); - -XBT_PUBLIC(void) __MSG_host_destroy(msg_host_t host); XBT_PUBLIC(double) MSG_host_get_power_peak_at(msg_host_t h, int pstate); XBT_PUBLIC(double) MSG_host_get_current_power_peak(msg_host_t h); XBT_PUBLIC(int) MSG_host_get_nb_pstates(msg_host_t h); -XBT_PUBLIC(void) MSG_host_set_pstate(msg_host_t h, int pstate); -XBT_PUBLIC(int) MSG_host_get_pstate(msg_host_t host); +#define MSG_host_get_pstate(h) sg_host_get_pstate(h) +#define MSG_host_set_pstate(h, pstate) sg_host_set_pstate(h, pstate) XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(void); XBT_PUBLIC(int) MSG_get_host_number(void); XBT_PUBLIC(void) MSG_host_get_params(msg_host_t ind_pm, vm_params_t params); @@ -321,8 +305,6 @@ XBT_PUBLIC(xbt_dict_t) MSG_host_get_mounted_storage_list(msg_host_t host); XBT_PUBLIC(xbt_dynar_t) MSG_host_get_attached_storage_list(msg_host_t host); XBT_PUBLIC(xbt_dict_t) MSG_host_get_storage_content(msg_host_t host); -XBT_PUBLIC(double) MSG_host_get_consumed_energy(msg_host_t h); - /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(msg_host_t host); XBT_PUBLIC(const char *) MSG_host_get_property_value(msg_host_t host, @@ -414,11 +396,6 @@ XBT_PUBLIC(void) MSG_task_set_name(msg_task_t task, const char *name); XBT_PUBLIC(msg_error_t) MSG_task_cancel(msg_task_t task); XBT_PUBLIC(msg_error_t) MSG_task_destroy(msg_task_t task); -XBT_PUBLIC(msg_error_t) MSG_task_receive_from_host(msg_task_t * task, const char *alias, - msg_host_t host); -XBT_PUBLIC(msg_error_t) MSG_task_receive_from_host_bounded(msg_task_t * task, const char *alias, - msg_host_t host, double rate); - XBT_PUBLIC(msg_error_t) MSG_task_execute(msg_task_t task); XBT_PUBLIC(msg_error_t) MSG_parallel_task_execute(msg_task_t task); XBT_PUBLIC(void) MSG_task_set_priority(msg_task_t task, double priority); @@ -531,55 +508,6 @@ XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path); XBT_PUBLIC(void) MSG_action_init(void); XBT_PUBLIC(void) MSG_action_exit(void); -#ifdef MSG_USE_DEPRECATED - -typedef msg_error_t MSG_error_t; - -#define MSG_global_init(argc, argv) MSG_init(argc,argv) -#define MSG_global_init_args(argc, argv) MSG_init(argc,argv) - -/* these are the functions which are deprecated. Do not use them, they may get removed in future releases */ -XBT_PUBLIC(msg_host_t *) MSG_get_host_table(void); - -#define MSG_host_is_avail(h) MSG_host_is_on(h) - -#define MSG_TIMEOUT_FAILURE MSG_TIMEOUT -#define MSG_TASK_CANCELLED MSG_TASK_CANCELED -#define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \ - MSG_mailbox_put_with_timeout(mailbox, task, timeout) - -#define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h); -XBT_PUBLIC(msg_error_t) MSG_get_errno(void); - -XBT_PUBLIC(msg_error_t) MSG_clean(void); - -XBT_PUBLIC(msg_error_t) MSG_task_get(msg_task_t * task, m_channel_t channel); -XBT_PUBLIC(msg_error_t) MSG_task_get_with_timeout(msg_task_t * task, - m_channel_t channel, - double max_duration); -XBT_PUBLIC(msg_error_t) MSG_task_get_from_host(msg_task_t * task, - int channel, msg_host_t host); -XBT_PUBLIC(msg_error_t) MSG_task_get_ext(msg_task_t * task, int channel, - double max_duration, - msg_host_t host); -XBT_PUBLIC(msg_error_t) MSG_task_put(msg_task_t task, msg_host_t dest, - m_channel_t channel); -XBT_PUBLIC(msg_error_t) MSG_task_put_bounded(msg_task_t task, - msg_host_t dest, - m_channel_t channel, - double max_rate); -XBT_PUBLIC(msg_error_t) MSG_task_put_with_timeout(msg_task_t task, - msg_host_t dest, - m_channel_t channel, - double max_duration); -XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); -XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); -XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, msg_host_t host); - -XBT_PUBLIC(msg_error_t) MSG_set_channel_number(int number); -XBT_PUBLIC(int) MSG_get_channel_number(void); -#endif - /** @brief Opaque type representing a semaphore * @ingroup msg_synchro * @hideinitializer