X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2fa4c958fad5cd1ff8f7325a933326869936268..a6924a7a3d99b6c4cd07e13dae75a33fbb634cf2:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index bbb438db96..aa2f024237 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -70,8 +71,6 @@ typedef enum { } msg_error_t; /* *************************** Network Zones ******************************** */ -#define msg_as_t msg_netzone_t /* portability macro */ - typedef sg_netzone_t msg_netzone_t; XBT_PUBLIC msg_netzone_t MSG_zone_get_root(); @@ -132,7 +131,6 @@ XBT_PUBLIC void MSG_host_on(sg_host_t h); */ XBT_PUBLIC void MSG_host_off(sg_host_t h); XBT_PUBLIC int MSG_host_is_on(sg_host_t h); -XBT_ATTRIB_DEPRECATED_v325("Please use !MSG_host_is_on()") XBT_PUBLIC int MSG_host_is_off(sg_host_t h); XBT_PUBLIC xbt_dict_t MSG_host_get_properties(sg_host_t host); XBT_PUBLIC const char* MSG_host_get_property_value(sg_host_t host, const char* name); XBT_PUBLIC void MSG_host_set_property_value(sg_host_t host, const char* name, const char* value); @@ -218,7 +216,7 @@ XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_res * SimGrid simulations run until all non-daemon processes are stopped. */ XBT_PUBLIC void MSG_process_daemonize(msg_process_t process); -/** @brief Imediately changes the host on which this process runs */ +/** @brief Immediately changes the host on which this process runs */ XBT_PUBLIC void MSG_process_migrate(msg_process_t process, msg_host_t host); /** @brief Wait for the completion of a process. * @@ -240,6 +238,8 @@ XBT_PUBLIC msg_process_t MSG_process_self(); XBT_PUBLIC aid_t MSG_process_self_PID(); XBT_PUBLIC aid_t MSG_process_self_PPID(); XBT_PUBLIC const char* MSG_process_self_name(); +XBT_PUBLIC void MSG_process_ref(msg_process_t process); +XBT_PUBLIC void MSG_process_unref(msg_process_t process); /** @brief Object representing an ongoing communication between processes. * @@ -268,16 +268,16 @@ XBT_PUBLIC void MSG_config(const char* key, const char* value); /** @brief Initialize the MSG internal data. * @hideinitializer * - * It also check that the link-time and compile-time versions of SimGrid do + * It also checks that the link-time and compile-time versions of SimGrid do * match, so you should use this version instead of the #MSG_init_nocheck * function that does the same initializations, but without this check. * - * We allow to link against compiled versions that differ in the patch level. + * We allow linking 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); \ - MSG_init_nocheck(argc, argv); \ + MSG_init_nocheck((argc), (argv)); \ } while (0) XBT_PUBLIC void MSG_init_nocheck(int* argc, char** argv); @@ -304,8 +304,12 @@ XBT_PUBLIC void MSG_function_register_default(xbt_main_func_t code); XBT_PUBLIC void MSG_create_environment(const char* file); /** @brief Creates the application described in the provided file */ XBT_PUBLIC void MSG_launch_application(const char* file); + +#ifndef DOXYGEN /** @brief register functions bypassing the parser */ -XBT_PUBLIC void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments); +XBT_ATTRIB_DEPRECATED_v329("This function will be removed. Speak up if you need it.") XBT_PUBLIC + void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments); +#endif /** @brief A clock (in second). */ XBT_PUBLIC double MSG_get_clock(); @@ -313,7 +317,6 @@ XBT_PUBLIC double MSG_get_clock(); XBT_PUBLIC unsigned long int MSG_get_sent_msg(); /************************** Process handling *********************************/ -XBT_PUBLIC void MSG_process_userdata_init(); XBT_PUBLIC msg_process_t MSG_process_create(const char* name, xbt_main_func_t code, void* data, msg_host_t host); XBT_PUBLIC msg_process_t MSG_process_create_with_arguments(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc, char** argv); @@ -333,9 +336,6 @@ XBT_PUBLIC msg_error_t MSG_process_set_data(msg_process_t process, void* data); XBT_PUBLIC void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data); -XBT_PUBLIC void MSG_process_ref(msg_process_t process); -XBT_PUBLIC void MSG_process_unref(msg_process_t process); - /************************** Task handling ************************************/ XBT_PUBLIC msg_task_t MSG_task_create(const char* name, double flops_amount, double bytes_amount, void* data); XBT_PUBLIC msg_task_t MSG_parallel_task_create(const char* name, int host_nb, const msg_host_t* host_list, @@ -363,22 +363,15 @@ XBT_PUBLIC void MSG_task_set_bytes_amount(msg_task_t task, double bytes_amount); XBT_PUBLIC double MSG_task_get_remaining_communication(msg_task_t task); XBT_PUBLIC double MSG_task_get_bytes_amount(msg_task_t task); -XBT_ATTRIB_DEPRECATED_v325("Getting a task from a specific host is no longer supported." - " Use MSG_task_receive_with_timeout instead.") XBT_PUBLIC msg_error_t - MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); - XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout); XBT_PUBLIC msg_error_t MSG_task_receive(msg_task_t* task, const char* alias); -#define MSG_task_recv(t,a) MSG_task_receive(t,a) - -XBT_PUBLIC msg_error_t MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, double timeout, - msg_host_t host, double rate); +#define MSG_task_recv(t, a) MSG_task_receive((t), (a)) XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char* alias, double timeout, double rate); XBT_PUBLIC msg_error_t MSG_task_receive_bounded(msg_task_t* task, const char* alias, double rate); -#define MSG_task_recv_bounded(t,a,r) MSG_task_receive_bounded(t,a,r) +#define MSG_task_recv_bounded(t, a, r) MSG_task_receive_bounded((t), (a), (r)) 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); @@ -435,7 +428,7 @@ XBT_PUBLIC int MSG_sem_would_block(msg_sem_t sem); /** @brief Opaque type representing a barrier identifier */ typedef sg_bar_t msg_bar_t; -/** @brief Initializes a barier, with count elements */ +/** @brief Initializes a barrier, with count elements */ XBT_PUBLIC msg_bar_t MSG_barrier_init(unsigned int count); /** @brief Destroys barrier */ XBT_PUBLIC void MSG_barrier_destroy(msg_bar_t bar); @@ -443,10 +436,6 @@ XBT_PUBLIC void MSG_barrier_destroy(msg_bar_t bar); XBT_PUBLIC int MSG_barrier_wait(msg_bar_t bar); /* ****************************************************************************************** */ -/* DO NOT USE this nasty pimple (unless if you're writing a binding) */ -XBT_ATTRIB_DEPRECATED_v325("MSG_process_set_copy_callback is deprecated. Please contact us if you need it.") XBT_PUBLIC - void MSG_task_set_copy_callback(void (*callback)(msg_task_t task, msg_process_t src, msg_process_t dst)); - #ifdef __cplusplus } #endif