X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/beab0c35a476db131ba31536ffd5ea9720fe7bae..4408bd3a6958dbde402aa725a8c8f668061134dc:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index e38fd6e1ff..5dcdecee3b 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -38,8 +38,8 @@ class Comm; class Task; } } -typedef simgrid::msg::Comm sg_msg_Comm; -typedef simgrid::msg::Task sg_msg_Task; +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; @@ -95,7 +95,7 @@ XBT_PUBLIC size_t MSG_get_host_number(); * 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(); +XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_list()") XBT_PUBLIC xbt_dynar_t MSG_hosts_as_dynar(); /** @brief Returns the name of this host */ XBT_PUBLIC const char* MSG_host_get_name(const_sg_host_t host); @@ -146,9 +146,9 @@ 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(const_sg_vm_t vm); XBT_PUBLIC void MSG_vm_set_ramsize(msg_vm_t vm, size_t size); @@ -204,7 +204,7 @@ XBT_PUBLIC const char* MSG_process_get_property_value(const_sg_actor_t process, 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. * @@ -223,7 +223,7 @@ XBT_PUBLIC void MSG_process_migrate(msg_process_t process, msg_host_t host); * @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 */ @@ -341,8 +341,8 @@ 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 xbt_dynar_t MSG_processes_as_dynar(); -XBT_PUBLIC int MSG_process_get_number(); +XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_list()") XBT_PUBLIC xbt_dynar_t MSG_processes_as_dynar(); +XBT_ATTRIB_DEPRECATED_v330("Please use sg_actor_count()") XBT_PUBLIC int MSG_process_get_number(); 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); @@ -435,9 +435,9 @@ XBT_PUBLIC msg_sem_t MSG_sem_init(int initial_value); XBT_PUBLIC void MSG_sem_acquire(msg_sem_t sem); 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 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(msg_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;