X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82fafbab5f8ce1530037fd245d678e917119caa0..b94ef9f53ddfc2ac1f56fee3e5b1962da78cafe9:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index f01edbf8f8..89daa7025e 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -23,8 +23,8 @@ 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); +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(); @@ -45,15 +45,15 @@ XBT_PUBLIC void SIMIX_global_init(int* argc, char** argv); XBT_PUBLIC void SIMIX_set_maestro(void (*code)(void*), void* data); /* Simulation execution */ -XBT_PUBLIC void SIMIX_run(); +XBT_ATTRIB_DEPRECATED_v332("Please use EngineImpl:run()") XBT_PUBLIC void SIMIX_run(); XBT_PUBLIC double SIMIX_get_clock(); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::set()") XBT_PUBLIC smx_timer_t +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::simix::Timer::remove()") XBT_PUBLIC +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::simix::Timer::next()") XBT_PUBLIC double SIMIX_timer_next(); -XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::get_date()") XBT_PUBLIC +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 @@ -64,7 +64,7 @@ SG_END_DECL 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 in 3.29") XBT_PUBLIC void SIMIX_init_application(); +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); @@ -84,13 +84,12 @@ 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 in 3.29") XBT_PUBLIC - void SIMIX_process_self_set_data(void* data); -XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC void* SIMIX_process_self_get_data(); +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(); SG_END_DECL #ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") XBT_PUBLIC +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 @@ -117,8 +116,9 @@ XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::wait_for()") XBT_PUBLIC simgri simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution, double timeout); XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::wait_for()") XBT_PUBLIC simgrid::kernel::activity::State simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution, double timeout); -XBT_PUBLIC unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, - double timeout); +XBT_ATTRIB_DEPRECATED_v331("Please use s4u::Exec::wait_any_for()") XBT_PUBLIC + unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, + double timeout); XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::test()") XBT_PUBLIC bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution); XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::test()") XBT_PUBLIC @@ -128,14 +128,8 @@ XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Exec::test()") XBT_PUBLIC /**************************** Process simcalls ********************************/ SG_BEGIN_DECL -XBT_ATTRIB_DEPRECATED_v329("This function will be removed in 3.29") void simcall_process_set_data(smx_actor_t process, - void* data); -XBT_ATTRIB_DEPRECATED_v328("Please use sg_actor_suspend()") XBT_PUBLIC - void simcall_process_suspend(smx_actor_t process); - -XBT_ATTRIB_DEPRECATED_v328("Please use sg_actor_join()") XBT_PUBLIC - void simcall_process_join(smx_actor_t process, double timeout); - +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 @@ -199,16 +193,19 @@ XBT_ATTRIB_DEPRECATED_v330("Please use an ActivityImpl* for first parameter") in /************************** Synchro simcalls **********************************/ SG_BEGIN_DECL XBT_ATTRIB_DEPRECATED_v330("Please use sg_mutex_init()") XBT_PUBLIC smx_mutex_t simcall_mutex_init(); -XBT_PUBLIC void simcall_mutex_lock(smx_mutex_t mutex); +XBT_ATTRIB_DEPRECATED_v331("Please use sg_mutex_lock()") XBT_PUBLIC void simcall_mutex_lock(smx_mutex_t mutex); XBT_ATTRIB_DEPRECATED_v331("Please use sg_mutex_try_lock()") XBT_PUBLIC int simcall_mutex_trylock(smx_mutex_t mutex); XBT_ATTRIB_DEPRECATED_v331("Please use sg_mutex_unlock()") XBT_PUBLIC void simcall_mutex_unlock(smx_mutex_t mutex); XBT_ATTRIB_DEPRECATED_v330("Please use sg_cond_init()") XBT_PUBLIC smx_cond_t simcall_cond_init(); -XBT_PUBLIC void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex); -XBT_PUBLIC int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double max_duration); - -XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem); -XBT_PUBLIC int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration); +XBT_ATTRIB_DEPRECATED_v331("Please use sg_cond_wait()") XBT_PUBLIC + void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex); +XBT_ATTRIB_DEPRECATED_v331("Please use sg_cond_wait_for()") XBT_PUBLIC + int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double max_duration); + +XBT_ATTRIB_DEPRECATED_v331("Please use sg_sem_acquire()") XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem); +XBT_ATTRIB_DEPRECATED_v331("Please use sg_sem_acquire_timeout()") XBT_PUBLIC + int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration); SG_END_DECL /***************************** Io **************************************/