X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/406f54970c00ca178fa918763d943027bd09e3ba..20f2291e7c83e26eebe9aeb61a91b76b5aed5a64:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index faa4e01d29..5f0077ed1a 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -32,7 +32,7 @@ typedef enum { /** @} */ /************************** Global ******************************************/ -XBT_PUBLIC(void) MSG_config(const char *name, ...); +XBT_PUBLIC(void) MSG_config(const char *key, const char *value); /** \ingroup msg_simulation * \brief Initialize the MSG internal data. * \hideinitializer @@ -95,7 +95,7 @@ XBT_PUBLIC(int) MSG_get_host_msgload(msg_host_t host); /* int MSG_get_msgload(void); This function lacks specification; discard it */ XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_avail(msg_host_t h); -XBT_PUBLIC(void) __MSG_host_destroy(msg_host_t host); +XBT_PUBLIC(void) __MSG_host_destroy(msg_host_priv_t host); /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(msg_host_t host); @@ -107,7 +107,6 @@ XBT_PUBLIC(void) MSG_host_set_property_value(msg_host_t host, XBT_PUBLIC(void) MSG_create_environment(const char *file); -XBT_PUBLIC(void) MSG_load_platform_script(const char *script_file); XBT_PUBLIC(msg_host_t) MSG_get_host_by_name(const char *name); XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(void); @@ -225,12 +224,14 @@ XBT_PUBLIC(msg_error_t) #define MSG_task_recv(t,a) MSG_task_receive(t,a) XBT_PUBLIC(msg_comm_t) MSG_task_isend(msg_task_t task, const char *alias); +XBT_PUBLIC(msg_comm_t) MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate); XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(msg_task_t task, const char *alias, int (*match_fun)(void*,void*, smx_action_t), void *match_data); XBT_PUBLIC(void) MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup); +XBT_PUBLIC(void) MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate); XBT_PUBLIC(msg_comm_t) MSG_task_irecv(msg_task_t * task, const char *alias); XBT_PUBLIC(int) MSG_comm_test(msg_comm_t comm); XBT_PUBLIC(int) MSG_comm_testany(xbt_dynar_t comms); @@ -250,6 +251,10 @@ XBT_PUBLIC(int) MSG_task_listen_from_host(const char *alias, XBT_PUBLIC(msg_error_t) MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout); + +XBT_PUBLIC(msg_error_t) + MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alias, + double timeout, double maxrate); XBT_PUBLIC(msg_error_t) MSG_task_send(msg_task_t task, const char *alias);