X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c9cf2269d00dab91af16e3ab7ed2228e2047817..3dd753cd9e46d794e00629d03183250aec4a17e4:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index a62ed6facb..6267fb0e1d 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -1,5 +1,4 @@ - -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -14,8 +13,10 @@ #include #include #include +#include #include -#include +#include +#include #include #include #include @@ -33,29 +34,44 @@ namespace simgrid { namespace msg { class Comm; +class Task; } } -typedef simgrid::msg::Comm sg_msg_Comm; +using sg_msg_Comm = simgrid::msg::Comm; +using sg_msg_Task = simgrid::msg::Task; #else typedef struct msg_Comm sg_msg_Comm; +typedef struct msg_Task sg_msg_Task; #endif #ifdef __cplusplus extern "C" { #endif -/* *************************** Network Zones ******************************** */ -#define msg_as_t msg_netzone_t /* portability macro */ +/** @brief Return code of most MSG functions */ +/* Keep these code as binary values: java bindings manipulate | of these values */ +typedef enum { + MSG_OK = 0, /**< @brief Everything is right. Keep on going this way ! */ + MSG_TIMEOUT = 1, /**< @brief nothing good happened before the timer you provided elapsed */ + MSG_TRANSFER_FAILURE = 2, /**< @brief There has been a problem during you task + transfer. Either the network is down or the remote host has been + shutdown. */ + MSG_HOST_FAILURE = 4, /**< @brief System shutdown. The host on which you are + running has just been rebooted. Free your datastructures and + return now !*/ + MSG_TASK_CANCELED = 8 /**< @brief Canceled task. This task has been canceled by somebody!*/ +} msg_error_t; +/* *************************** Network Zones ******************************** */ typedef sg_netzone_t msg_netzone_t; XBT_PUBLIC msg_netzone_t MSG_zone_get_root(); -XBT_PUBLIC const char* MSG_zone_get_name(msg_netzone_t zone); +XBT_PUBLIC const char* MSG_zone_get_name(const_sg_netzone_t zone); XBT_PUBLIC msg_netzone_t MSG_zone_get_by_name(const char* name); -XBT_PUBLIC void MSG_zone_get_sons(msg_netzone_t zone, xbt_dict_t whereto); -XBT_PUBLIC const char* MSG_zone_get_property_value(msg_netzone_t zone, const char* name); -XBT_PUBLIC void MSG_zone_set_property_value(msg_netzone_t zone, const char* name, char* value); -XBT_PUBLIC void MSG_zone_get_hosts(msg_netzone_t zone, xbt_dynar_t whereto); +XBT_PUBLIC void MSG_zone_get_sons(const_sg_netzone_t zone, xbt_dict_t whereto); +XBT_PUBLIC const char* MSG_zone_get_property_value(const_sg_netzone_t zone, const char* name); +XBT_PUBLIC void MSG_zone_set_property_value(msg_netzone_t zone, const char* name, const char* value); +XBT_PUBLIC void MSG_zone_get_hosts(const_sg_netzone_t zone, xbt_dynar_t whereto); /* ******************************** Hosts ************************************ */ /** @brief Host datatype. @@ -73,48 +89,45 @@ XBT_PUBLIC sg_host_t MSG_host_by_name(const char* name); /** @brief Returns the amount of host found in the platform */ XBT_PUBLIC size_t MSG_get_host_number(); -/** @brief Returns a dynar with all existing hosts - * - * The host order in the returned array is generally different from the host creation/declaration order in the XML - * platform (we use a hash table internally). - */ -XBT_PUBLIC xbt_dynar_t MSG_hosts_as_dynar(); /** @brief Returns the name of this host */ -XBT_PUBLIC const char* MSG_host_get_name(sg_host_t host); +XBT_PUBLIC const char* MSG_host_get_name(const_sg_host_t host); /** @brief Returns the user data of this host */ -XBT_PUBLIC void* MSG_host_get_data(sg_host_t host); +XBT_PUBLIC void* MSG_host_get_data(const_sg_host_t host); /** @brief Sets the user data of this host */ XBT_PUBLIC void MSG_host_set_data(sg_host_t host, void* data); -XBT_PUBLIC xbt_dict_t MSG_host_get_mounted_storage_list(sg_host_t host); -XBT_PUBLIC xbt_dynar_t MSG_host_get_attached_storage_lists(sg_host_t host); -XBT_PUBLIC double MSG_host_get_speed(sg_host_t host); -XBT_PUBLIC double MSG_host_get_power_peak_at(sg_host_t host, int pstate_index); -XBT_PUBLIC int MSG_host_get_core_number(sg_host_t host); -XBT_PUBLIC int MSG_host_get_nb_pstates(sg_host_t host); -XBT_PUBLIC int MSG_host_get_pstate(sg_host_t host); + +XBT_PUBLIC double MSG_host_get_speed(const_sg_host_t host); +XBT_PUBLIC double MSG_host_get_power_peak_at(const_sg_host_t host, int pstate_index); +XBT_PUBLIC int MSG_host_get_core_number(const_sg_host_t host); +XBT_PUBLIC int MSG_host_get_nb_pstates(const_sg_host_t host); +XBT_PUBLIC int MSG_host_get_pstate(const_sg_host_t host); XBT_PUBLIC void MSG_host_set_pstate(sg_host_t host, int pstate); /** @brief Start the host if it is off * - * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref SURF_plugin_energy + * @beginrst + * See also :cpp:func:`MSG_host_is_on()` to test the current state of the host, and :ref:`plugin_host_energy` * for more info on DVFS. + * @endrst */ XBT_PUBLIC void MSG_host_on(sg_host_t h); /** @brief Stop the host if it is on * - * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref SURF_plugin_energy + * @beginrst + * See also :cpp:func:`MSG_host_is_on()` to test the current state of the host, and :ref:`plugin_host_energy` * for more info on DVFS. + * @endrst */ XBT_PUBLIC void MSG_host_off(sg_host_t h); -XBT_PUBLIC int MSG_host_is_on(sg_host_t h); -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 int MSG_host_is_on(const_sg_host_t h); +XBT_PUBLIC xbt_dict_t MSG_host_get_properties(const_sg_host_t host); +XBT_PUBLIC const char* MSG_host_get_property_value(const_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); -XBT_PUBLIC void MSG_host_get_process_list(sg_host_t host, xbt_dynar_t whereto); +XBT_PUBLIC void MSG_host_get_process_list(const_sg_host_t host, xbt_dynar_t whereto); /** @brief Return the location on which the current process is executed */ XBT_PUBLIC sg_host_t MSG_host_self(); +XBT_PUBLIC double MSG_host_get_load(const_sg_host_t host); /* ******************************** VMs ************************************* */ typedef sg_vm_t msg_vm_t; @@ -122,14 +135,14 @@ typedef sg_vm_t msg_vm_t; XBT_PUBLIC msg_vm_t MSG_vm_create_core(msg_host_t pm, const char* name); XBT_PUBLIC msg_vm_t MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount); -XBT_PUBLIC int MSG_vm_is_created(msg_vm_t vm); -XBT_PUBLIC int MSG_vm_is_running(msg_vm_t vm); -XBT_PUBLIC int MSG_vm_is_suspended(msg_vm_t vm); +XBT_PUBLIC int MSG_vm_is_created(const_sg_vm_t vm); +XBT_PUBLIC int MSG_vm_is_running(const_sg_vm_t vm); +XBT_PUBLIC int MSG_vm_is_suspended(const_sg_vm_t vm); -XBT_PUBLIC const char* MSG_vm_get_name(msg_vm_t vm); +XBT_PUBLIC const char* MSG_vm_get_name(const_sg_vm_t vm); XBT_PUBLIC void MSG_vm_set_ramsize(msg_vm_t vm, size_t size); -XBT_PUBLIC size_t MSG_vm_get_ramsize(msg_vm_t vm); -XBT_PUBLIC msg_host_t MSG_vm_get_pm(msg_vm_t vm); +XBT_PUBLIC size_t MSG_vm_get_ramsize(const_sg_vm_t vm); +XBT_PUBLIC msg_host_t MSG_vm_get_pm(const_sg_vm_t vm); XBT_PUBLIC void MSG_vm_set_bound(msg_vm_t vm, double bound); XBT_PUBLIC void MSG_vm_start(msg_vm_t vm); @@ -138,43 +151,34 @@ XBT_PUBLIC void MSG_vm_resume(msg_vm_t vm); XBT_PUBLIC void MSG_vm_shutdown(msg_vm_t vm); XBT_PUBLIC void MSG_vm_destroy(msg_vm_t vm); -/* ******************************** Storage ********************************* */ -typedef sg_storage_t msg_storage_t; - -XBT_PUBLIC const char* MSG_storage_get_name(msg_storage_t storage); -XBT_PUBLIC msg_storage_t MSG_storage_get_by_name(const char* name); -XBT_PUBLIC xbt_dict_t MSG_storage_get_properties(msg_storage_t storage); -XBT_PUBLIC void MSG_storage_set_property_value(msg_storage_t storage, const char* name, const char* value); -XBT_PUBLIC const char* MSG_storage_get_property_value(msg_storage_t storage, const char* name); -XBT_PUBLIC xbt_dynar_t MSG_storages_as_dynar(); -XBT_PUBLIC void MSG_storage_set_data(msg_storage_t storage, void* data); -XBT_PUBLIC void* MSG_storage_get_data(msg_storage_t storage); -XBT_PUBLIC const char* MSG_storage_get_host(msg_storage_t storage); -XBT_PUBLIC sg_size_t MSG_storage_read(msg_storage_t storage, sg_size_t size); -XBT_PUBLIC sg_size_t MSG_storage_write(msg_storage_t storage, sg_size_t size); - /* ******************************** Actor/process *************************** */ +/** Processes are independent agents that can do stuff on their own. + * They are in charge of executing your code interacting with the simulated world. + * A process may be defined as a code with some private data. + * Processes must be located on hosts (#msg_host_t), and they exchange data by sending tasks (#msg_task_t) + * that are similar to envelops containing data. + * + * @hideinitializer + */ typedef sg_actor_t msg_process_t; -XBT_PUBLIC int MSG_process_get_PID(msg_process_t process); -XBT_PUBLIC int MSG_process_get_PPID(msg_process_t process); -/** @brief Return a #msg_process_t from its PID. +XBT_PUBLIC int MSG_process_get_PID(const_sg_actor_t process); +XBT_PUBLIC int MSG_process_get_PPID(const_sg_actor_t process); +/** @brief Return a process from its PID (or NULL if not found). * - * Note that the PID are uniq in the whole simulation, not only on a given host. - * - * @returns NULL if no host is found + * Note that the PID are unique in the whole simulation, not only on a given host. */ XBT_PUBLIC sg_actor_t MSG_process_from_PID(int pid); -XBT_PUBLIC const char* MSG_process_get_name(msg_process_t process); -XBT_PUBLIC sg_host_t MSG_process_get_host(msg_process_t process); +XBT_PUBLIC const char* MSG_process_get_name(const_sg_actor_t process); +XBT_PUBLIC sg_host_t MSG_process_get_host(const_sg_actor_t process); /*property handlers*/ -XBT_PUBLIC xbt_dict_t MSG_process_get_properties(msg_process_t process); -XBT_PUBLIC const char* MSG_process_get_property_value(msg_process_t process, const char* name); +XBT_PUBLIC xbt_dict_t MSG_process_get_properties(const_sg_actor_t process); +XBT_PUBLIC const char* MSG_process_get_property_value(const_sg_actor_t process, const char* name); XBT_PUBLIC void MSG_process_suspend(msg_process_t process); XBT_PUBLIC void MSG_process_resume(msg_process_t process); -XBT_PUBLIC int MSG_process_is_suspended(msg_process_t process); +XBT_PUBLIC int MSG_process_is_suspended(const_sg_actor_t process); XBT_PUBLIC void MSG_process_restart(msg_process_t process); /** @brief Sets the "auto-restart" flag of the process. * @@ -186,42 +190,39 @@ 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 #msg_process_t. +/** @brief Wait for the completion of a process. * * @param process the process to wait for * @param timeout wait until the process is over, or the timeout occurs */ -XBT_PUBLIC void MSG_process_join(msg_process_t process, double timeout); +XBT_PUBLIC void MSG_process_join(const_sg_actor_t process, double timeout); /** @brief Kills a process */ XBT_PUBLIC void MSG_process_kill(msg_process_t process); /** @brief Kill all running process */ XBT_PUBLIC void MSG_process_killall(); -/** @breif Specifies the time at which the process should be automatically killed */ +/** @brief Specifies the time at which the process should be automatically killed */ XBT_PUBLIC void MSG_process_set_kill_time(msg_process_t process, double kill_time); /** @brief Yield the current actor; let the other actors execute first */ 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(const_sg_actor_t process); +XBT_PUBLIC void MSG_process_unref(const_sg_actor_t process); /** @brief Object representing an ongoing communication between processes. * - * \rst + * @beginrst * Such beast is usually obtained by using :cpp:func:`MSG_task_isend`, :cpp:func:`MSG_task_irecv` or friends. - * \endrst + * @endrst */ typedef sg_msg_Comm* msg_comm_t; - -/* ******************************** Task ************************************ */ - -typedef struct s_simdata_task_t* simdata_task_t; - -typedef struct msg_task { - char* name; /**< @brief task name if any */ - simdata_task_t simdata; /**< @brief simulator data */ - void* data; /**< @brief user data */ - long long int counter; /* task unique identifier for instrumentation */ - char* category; /* task category for instrumentation */ -} s_msg_task_t; +typedef const sg_msg_Comm* const_msg_comm_t; /** @brief Task datatype. * @@ -230,50 +231,40 @@ typedef struct msg_task { * A task may then be defined by a computing amount, a message size and * some private data. */ +typedef sg_msg_Task* msg_task_t; +typedef const sg_msg_Task* const_msg_task_t; + +/* ******************************** Task ************************************ */ -typedef struct msg_task* msg_task_t; /** @brief Default value for an uninitialized #msg_task_t. */ #define MSG_TASK_UNINITIALIZED NULL -/** @brief Return code of most MSG functions */ -/* Keep these code as binary values: java bindings manipulate | of these values */ -typedef enum { - MSG_OK = 0, /**< @brief Everything is right. Keep on going this way ! */ - MSG_TIMEOUT = 1, /**< @brief nothing good happened before the timer you provided elapsed */ - MSG_TRANSFER_FAILURE = 2, /**< @brief There has been a problem during you task - transfer. Either the network is down or the remote host has been - shutdown. */ - MSG_HOST_FAILURE = 4, /**< @brief System shutdown. The host on which you are - running has just been rebooted. Free your datastructures and - return now !*/ - MSG_TASK_CANCELED = 8 /**< @brief Canceled task. This task has been canceled by somebody!*/ -} msg_error_t; - /************************** Global ******************************************/ /** @brief set a configuration variable * - * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref - * options. + * @beginrst + * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section + * :ref:`options`. + * @endrst * * Example: * MSG_config("host/model","ptask_L07"); */ XBT_PUBLIC void MSG_config(const char* key, const char* value); -/** @ingroup msg_simulation - * @brief Initialize the MSG internal data. +/** @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); @@ -286,7 +277,7 @@ XBT_PUBLIC msg_error_t MSG_main(); * @param code the function (must have the same prototype than the main function of any C program: int ..(int argc, char * *argv[])) */ -XBT_PUBLIC void MSG_function_register(const char* name, xbt_main_func_t code); +XBT_PUBLIC void MSG_function_register(const char* name, int (*code)(int, char**)); /** @brief Registers a code function as being the default value. * * This function will get used by MSG_launch_application() when there is no registered function of the requested name @@ -295,13 +286,11 @@ XBT_PUBLIC void MSG_function_register(const char* name, xbt_main_func_t code); * @param code the function (must have the same prototype than the main function of any C program: int ..(int argc, char * *argv[])) */ -XBT_PUBLIC void MSG_function_register_default(xbt_main_func_t code); +XBT_PUBLIC void MSG_function_register_default(int (*code)(int, char**)); /** @brief Creates a new platform, including hosts, links and the routing_table */ 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); -/** @brief register functions bypassing the parser */ -XBT_PUBLIC void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments); /** @brief A clock (in second). */ XBT_PUBLIC double MSG_get_clock(); @@ -309,10 +298,10 @@ XBT_PUBLIC double MSG_get_clock(); XBT_PUBLIC unsigned long int MSG_get_sent_msg(); /************************** Process handling *********************************/ -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, +XBT_PUBLIC msg_process_t MSG_process_create(const char* name, int (*code)(int, char**), void* data, msg_host_t host); +XBT_PUBLIC msg_process_t MSG_process_create_with_arguments(const char* name, int (*code)(int, char**), void* data, msg_host_t host, int argc, char** argv); -XBT_PUBLIC msg_process_t MSG_process_create_with_environment(const char* name, xbt_main_func_t code, void* data, +XBT_PUBLIC msg_process_t MSG_process_create_with_environment(const char* name, int (*code)(int, char**), void* data, msg_host_t host, int argc, char** argv, xbt_dict_t properties); @@ -320,31 +309,21 @@ 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(); -XBT_PUBLIC void* MSG_process_get_data(msg_process_t process); +XBT_PUBLIC void* MSG_process_get_data(const_sg_actor_t process); XBT_PUBLIC msg_error_t MSG_process_set_data(msg_process_t process, void* data); -XBT_PUBLIC void MSG_process_on_exit(int_f_pvoid_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); +XBT_PUBLIC void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data); /************************** 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, double* flops_amount, double* bytes_amount, void* data); -XBT_PUBLIC void* MSG_task_get_data(msg_task_t task); +XBT_PUBLIC void* MSG_task_get_data(const_msg_task_t task); XBT_PUBLIC void MSG_task_set_data(msg_task_t task, void* data); -XBT_PUBLIC void MSG_task_set_copy_callback(void (*callback)(msg_task_t task, msg_process_t src, msg_process_t dst)); -XBT_PUBLIC msg_process_t MSG_task_get_sender(msg_task_t task); -XBT_PUBLIC msg_host_t MSG_task_get_source(msg_task_t task); -XBT_PUBLIC const char* MSG_task_get_name(msg_task_t task); +XBT_PUBLIC msg_process_t MSG_task_get_sender(const_msg_task_t task); +XBT_PUBLIC msg_host_t MSG_task_get_source(const_msg_task_t task); +XBT_PUBLIC const char* MSG_task_get_name(const_msg_task_t task); 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); @@ -355,30 +334,23 @@ XBT_PUBLIC msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, d XBT_PUBLIC void MSG_task_set_priority(msg_task_t task, double priority); XBT_PUBLIC void MSG_task_set_bound(msg_task_t task, double bound); -XBT_PUBLIC msg_error_t MSG_process_sleep(double nb_sec); - XBT_PUBLIC void MSG_task_set_flops_amount(msg_task_t task, double flops_amount); -XBT_PUBLIC double MSG_task_get_flops_amount(msg_task_t task); -XBT_PUBLIC double MSG_task_get_remaining_work_ratio(msg_task_t task); +XBT_PUBLIC double MSG_task_get_flops_amount(const_msg_task_t task); +XBT_PUBLIC double MSG_task_get_remaining_work_ratio(const_msg_task_t task); 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_PUBLIC msg_error_t MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); +XBT_PUBLIC double MSG_task_get_remaining_communication(const_msg_task_t task); +XBT_PUBLIC double MSG_task_get_bytes_amount(const_msg_task_t task); 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); @@ -388,13 +360,13 @@ XBT_PUBLIC void MSG_task_dsend_bounded(msg_task_t task, const char* alias, void_ XBT_PUBLIC msg_comm_t MSG_task_irecv(msg_task_t* task, const char* alias); XBT_PUBLIC msg_comm_t MSG_task_irecv_bounded(msg_task_t* task, const char* alias, double rate); XBT_PUBLIC int MSG_comm_test(msg_comm_t comm); -XBT_PUBLIC int MSG_comm_testany(xbt_dynar_t comms); -XBT_PUBLIC void MSG_comm_destroy(msg_comm_t comm); +XBT_PUBLIC int MSG_comm_testany(const_xbt_dynar_t comms); +XBT_PUBLIC void MSG_comm_destroy(const_msg_comm_t comm); XBT_PUBLIC msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout); XBT_PUBLIC void MSG_comm_waitall(msg_comm_t* comm, int nb_elem, double timeout); -XBT_PUBLIC int MSG_comm_waitany(xbt_dynar_t comms); -XBT_PUBLIC msg_task_t MSG_comm_get_task(msg_comm_t comm); -XBT_PUBLIC msg_error_t MSG_comm_get_status(msg_comm_t comm); +XBT_PUBLIC int MSG_comm_waitany(const_xbt_dynar_t comms); +XBT_PUBLIC msg_task_t MSG_comm_get_task(const_msg_comm_t comm); +XBT_PUBLIC msg_error_t MSG_comm_get_status(const_msg_comm_t comm); /** @brief Check if there is a communication going on in a mailbox. * @@ -410,7 +382,7 @@ XBT_PUBLIC msg_error_t MSG_task_send(msg_task_t task, const char* alias); XBT_PUBLIC msg_error_t MSG_task_send_bounded(msg_task_t task, const char* alias, double rate); XBT_PUBLIC int MSG_task_listen_from(const char* alias); XBT_PUBLIC void MSG_task_set_category(msg_task_t task, const char* category); -XBT_PUBLIC const char* MSG_task_get_category(msg_task_t task); +XBT_PUBLIC const char* MSG_task_get_category(const_msg_task_t task); /************************** Mailbox handling ************************************/ @@ -423,43 +395,28 @@ XBT_PUBLIC const char* MSG_task_get_category(msg_task_t task); */ XBT_PUBLIC void MSG_mailbox_set_async(const char* alias); -/** @brief Opaque type representing a semaphore - * @ingroup msg_synchro - * @hideinitializer - */ -typedef struct s_smx_sem_t* msg_sem_t; // Yeah that's a rename of the smx_sem_t which doesnt require smx_sem_t to be - // declared here +/** @brief Opaque type representing a semaphore */ +typedef sg_sem_t msg_sem_t; XBT_PUBLIC msg_sem_t MSG_sem_init(int initial_value); XBT_PUBLIC void MSG_sem_acquire(msg_sem_t sem); -XBT_PUBLIC msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout); +XBT_PUBLIC int MSG_sem_acquire_timeout(msg_sem_t sem, double timeout); XBT_PUBLIC void MSG_sem_release(msg_sem_t sem); -XBT_PUBLIC int MSG_sem_get_capacity(msg_sem_t sem); -XBT_PUBLIC void MSG_sem_destroy(msg_sem_t sem); -XBT_PUBLIC int MSG_sem_would_block(msg_sem_t sem); +XBT_PUBLIC int MSG_sem_get_capacity(const_sg_sem_t sem); +XBT_PUBLIC void MSG_sem_destroy(const_sg_sem_t sem); +XBT_PUBLIC int MSG_sem_would_block(const_sg_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); +XBT_PUBLIC void MSG_barrier_destroy(const_sg_bar_t bar); /** @brief Performs a barrier already initialized */ XBT_PUBLIC int MSG_barrier_wait(msg_bar_t bar); /* ****************************************************************************************** */ -/* DO NOT USE this nasty pimple (unless if you're writing a binding) */ -XBT_PUBLIC smx_context_t -XBT_ATTRIB_DEPRECATED_v323("MSG_process_get_smx_ctx is deprecated. Please contact us if you need it.") -MSG_process_get_smx_ctx(msg_process_t process); - #ifdef __cplusplus } #endif -#ifdef __cplusplus -XBT_PUBLIC msg_process_t MSG_process_create_from_stdfunc(std::string name, std::function code, void* data, - msg_host_t host, - std::unordered_map* properties); -#endif - #endif