X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d648ebbbe5705878080b9cbf1ca61497323c592..23a502252be475af7547139790b3f2310b3c9603:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index d9d09d0aa7..b3f49b091d 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -69,8 +70,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(); @@ -131,7 +130,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); @@ -235,6 +233,12 @@ XBT_PUBLIC void MSG_process_set_kill_time(msg_process_t process, double kill_tim XBT_PUBLIC void MSG_process_yield(); /*** @brief Sleep for the specified number of seconds */ XBT_PUBLIC msg_error_t MSG_process_sleep(double nb_sec); +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. * @@ -263,16 +267,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); @@ -320,10 +324,6 @@ XBT_PUBLIC msg_process_t MSG_process_attach(const char* name, void* data, msg_ho XBT_PUBLIC void MSG_process_detach(); XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); -XBT_PUBLIC int MSG_process_self_PID(); -XBT_PUBLIC int MSG_process_self_PPID(); -XBT_PUBLIC const char* MSG_process_self_name(); -XBT_PUBLIC msg_process_t MSG_process_self(); XBT_PUBLIC xbt_dynar_t MSG_processes_as_dynar(); XBT_PUBLIC int MSG_process_get_number(); @@ -332,9 +332,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, @@ -362,22 +359,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); @@ -442,12 +432,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_v323("MSG_process_get_smx_ctx is deprecated. Please contact us if you need it.") - XBT_PUBLIC smx_context_t MSG_process_get_smx_ctx(msg_process_t process); -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