X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..4b0fa756ae6e58a74c374a519389ecb9e8b6a4d9:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 70bc569741..33ab45c106 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -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); @@ -103,7 +103,10 @@ XBT_PUBLIC const char* MSG_host_get_name(const_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_ATTRIB_DEPRECATED_v330("This function will be removed. Speak up if you need it.") 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(const_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); @@ -201,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. * @@ -300,7 +303,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 @@ -309,7 +312,7 @@ 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 */ @@ -327,10 +330,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); @@ -338,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);