X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16f1630ae434e729cbe0b24fe2f19c8f67f774cd..17015166daf4c69a05fe412053880c80c5333d87:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 8899662e15..8ffb312ae5 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -17,35 +17,6 @@ #include #endif -/* ******************************** Host ************************************ */ -/** @brief Host datatype - @ingroup simix_host_management - - A location (or host) is any possible place where - a process may run. Thus it is represented as a physical - resource with computing capabilities, some mailboxes - to enable running process to communicate with remote ones, and - some private data that can be only accessed by local - process. - - @see m_host_management - @{ */ -typedef enum { - SIMIX_WAITING, - SIMIX_READY, - SIMIX_RUNNING, - SIMIX_DONE, - SIMIX_CANCELED, - SIMIX_FAILED, - SIMIX_SRC_HOST_FAILURE, - SIMIX_DST_HOST_FAILURE, - SIMIX_TIMEOUT, - SIMIX_SRC_TIMEOUT, - SIMIX_DST_TIMEOUT, - SIMIX_LINK_FAILURE -} e_smx_state_t; -/** @} */ - /******************************* Networking ***********************************/ extern unsigned smx_context_stack_size; extern unsigned smx_context_guard_size; @@ -91,17 +62,21 @@ SG_END_DECL /******************************** Deployment **********************************/ SG_BEGIN_DECL -XBT_PUBLIC void SIMIX_function_register_default(xbt_main_func_t code); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_register_default() or Engine::register_default()") XBT_PUBLIC + void SIMIX_function_register_default(xbt_main_func_t code); +XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC void SIMIX_init_application(); -XBT_PUBLIC void SIMIX_init_application(); XBT_PUBLIC void SIMIX_process_set_function(const char* process_host, const char* process_function, xbt_dynar_t arguments, double process_start_time, double process_kill_time); SG_END_DECL #ifdef __cplusplus -XBT_PUBLIC void SIMIX_function_register(const std::string& name, void (*code)(std::vector)); -XBT_PUBLIC void SIMIX_function_register(const std::string& name, xbt_main_func_t code); -XBT_PUBLIC void SIMIX_launch_application(const std::string& file); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_register_function() or Engine::register_function()") XBT_PUBLIC + void SIMIX_function_register(const std::string& name, void (*code)(std::vector)); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_register_function() or Engine::register_function()") XBT_PUBLIC + void SIMIX_function_register(const std::string& name, xbt_main_func_t code); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid_load_deployment() or Engine::load_deployment()") XBT_PUBLIC + void SIMIX_launch_application(const std::string& file); #endif /********************************* Process ************************************/ @@ -115,7 +90,8 @@ XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC v SG_END_DECL #ifdef __cplusplus -XBT_PUBLIC void SIMIX_process_on_exit(smx_actor_t process, const std::function& fun); +XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC + void SIMIX_process_on_exit(smx_actor_t process, const std::function& fun); #endif /****************************** Communication *********************************/ @@ -152,8 +128,8 @@ XBT_ATTRIB_DEPRECATED_v328("Please use Actor::suspend()") XBT_PUBLIC void simcal XBT_ATTRIB_DEPRECATED_v328("Please use Actor::join()") XBT_PUBLIC void simcall_process_join(smx_actor_t process, double timeout); -/* Sleep control */ -XBT_PUBLIC e_smx_state_t simcall_process_sleep(double duration); +XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_sleep_for()") XBT_PUBLIC e_smx_state_t + simcall_process_sleep(double duration); SG_END_DECL /************************** Communication simcalls ****************************/