X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b547799240cfe5d60c1c4161e3fc8849095e2ca..6713a1028a3d18b025e2588092a9418077a88a4b:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index eeb501f90a..50f845ee99 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -18,89 +18,51 @@ #endif /******************************* Networking ***********************************/ -extern unsigned smx_context_stack_size; -extern unsigned smx_context_guard_size; - SG_BEGIN_DECL XBT_ATTRIB_DEPRECATED_v331("Please use sg_actor_by_pid() instead.") XBT_PUBLIC smx_actor_t SIMIX_process_from_PID(aid_t pid); /* parallelism */ -XBT_PUBLIC int SIMIX_context_is_parallel(); -XBT_PUBLIC int SIMIX_context_get_nthreads(); -XBT_PUBLIC void SIMIX_context_set_nthreads(int nb_threads); -XBT_PUBLIC e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(); -XBT_PUBLIC void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode); -XBT_PUBLIC int SIMIX_is_maestro(); +XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::is_parallel()") XBT_PUBLIC int SIMIX_context_is_parallel(); +XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::get_nthreads()") XBT_PUBLIC int SIMIX_context_get_nthreads(); +XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::set_nthreads()") XBT_PUBLIC + void SIMIX_context_set_nthreads(int nb_threads); +XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::get_parallel_mode()") XBT_PUBLIC e_xbt_parmap_mode_t + SIMIX_context_get_parallel_mode(); +XBT_ATTRIB_DEPRECATED_v333("Please use kernel::context::set_parallel_mode()") XBT_PUBLIC + void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode); +XBT_ATTRIB_DEPRECATED_v333("Please use Actor::is_maestro()") XBT_PUBLIC int SIMIX_is_maestro(); /********************************** Global ************************************/ -/* Initialization and exit */ -XBT_PUBLIC void SIMIX_global_init(int* argc, char** argv); - /* Set some code to execute in the maestro (must be used before the engine creation) * * If no maestro code is registered (the default), the main thread * is assumed to be the maestro. */ -XBT_PUBLIC void SIMIX_set_maestro(void (*code)(void*), void* data); +XBT_ATTRIB_DEPRECATED_v333("Please use simgrid_set_maestro()") XBT_PUBLIC + void SIMIX_set_maestro(void (*code)(void*), void* data); /* Simulation execution */ XBT_ATTRIB_DEPRECATED_v332("Please use EngineImpl:run()") XBT_PUBLIC void SIMIX_run(); XBT_ATTRIB_DEPRECATED_v332("Please use simgrid_get_clock() or Engine::get_clock()") XBT_PUBLIC double SIMIX_get_clock(); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::set()") XBT_PUBLIC smx_timer_t - SIMIX_timer_set(double date, void (*function)(void*), void* arg); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::remove()") XBT_PUBLIC - void SIMIX_timer_remove(smx_timer_t timer); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::next()") XBT_PUBLIC double SIMIX_timer_next(); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::kernel::timer::Timer::get_date()") XBT_PUBLIC - double SIMIX_timer_get_date(smx_timer_t timer); - -XBT_ATTRIB_DEPRECATED_v329("Please use simix_global->display_all_actor_status()") XBT_PUBLIC - void SIMIX_display_process_status(); -SG_END_DECL - -/******************************** Deployment **********************************/ -SG_BEGIN_DECL -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") 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_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 ************************************/ SG_BEGIN_DECL -XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_count()") XBT_PUBLIC int SIMIX_process_count(); -XBT_PUBLIC smx_actor_t SIMIX_process_self(); -XBT_PUBLIC const char* SIMIX_process_self_get_name(); -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC void SIMIX_process_self_set_data(void* data); -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC void* SIMIX_process_self_get_data(); +XBT_ATTRIB_DEPRECATED_v333("Please use kernel::actor::ActorImpl::self()") XBT_PUBLIC smx_actor_t SIMIX_process_self(); +XBT_ATTRIB_DEPRECATED_v333("Please use xbt_procname()") XBT_PUBLIC const char* SIMIX_process_self_get_name(); SG_END_DECL -#ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") XBT_PUBLIC - void SIMIX_process_on_exit(smx_actor_t process, const std::function& fun); -#endif - /****************************** Communication *********************************/ #ifdef __cplusplus -XBT_PUBLIC void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, - size_t)); -XBT_PUBLIC void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, - size_t buff_size); -XBT_PUBLIC void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, - size_t buff_size); +XBT_ATTRIB_DEPRECATED_v333("Please use Engine::set_default_comm_data_copy_callback()") XBT_PUBLIC + void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t)); + +XBT_ATTRIB_DEPRECATED_v333("Please use Comm::copy_buffer_callback()") XBT_PUBLIC + void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size); +XBT_ATTRIB_DEPRECATED_v333("Please use Comm::copy_pointer_callback()") XBT_PUBLIC + void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size); #endif /******************************************************************************/ @@ -126,19 +88,6 @@ XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::test()") XBT_PUBLIC #endif -/**************************** Process simcalls ********************************/ -SG_BEGIN_DECL -XBT_ATTRIB_DEPRECATED_v329("This function will be removed") void simcall_process_set_data(smx_actor_t process, - void* data); -XBT_ATTRIB_DEPRECATED_v329("Please use sg_actor_sleep_for()") XBT_PUBLIC -#ifdef __cplusplus - simgrid::kernel::activity::State -#else - enum kernel_activity_state -#endif - simcall_process_sleep(double duration); -SG_END_DECL - /************************** Communication simcalls ****************************/ #ifdef __cplusplus