X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55b17883ef3f90e6d5899e321610d6716e2d0928..d4b84bf7c2cc1ffe1c73852ce1b6664930bc5f3a:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 1a6bb09d9d..d40ac53d3d 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -86,26 +86,19 @@ XBT_PUBLIC void SIMIX_set_maestro(void (*code)(void*), void* data); XBT_PUBLIC void SIMIX_run(); XBT_PUBLIC double SIMIX_get_clock(); -XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, void (*function)(void*), void* arg); -XBT_PUBLIC void SIMIX_timer_remove(smx_timer_t timer); -XBT_PUBLIC double SIMIX_timer_next(); -XBT_PUBLIC double SIMIX_timer_get_date(smx_timer_t timer); +XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::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 + 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 + double SIMIX_timer_get_date(smx_timer_t timer); XBT_PUBLIC void SIMIX_display_process_status(); SG_END_DECL() -/******************************* Environment **********************************/ -SG_BEGIN_DECL() -XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_load_platform()") XBT_PUBLIC - void SIMIX_create_environment(const char* file); -SG_END_DECL() - /******************************** Deployment **********************************/ SG_BEGIN_DECL() -XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_register_function()") XBT_PUBLIC - void SIMIX_function_register(const char* name, xbt_main_func_t code); -XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_load_deployment()") XBT_PUBLIC - void SIMIX_launch_application(const char* file); XBT_PUBLIC void SIMIX_function_register_default(xbt_main_func_t code); XBT_PUBLIC void SIMIX_init_application(); @@ -119,42 +112,16 @@ XBT_PUBLIC void SIMIX_function_register(const std::string& name, xbt_main_func_t XBT_PUBLIC void SIMIX_launch_application(const std::string& file); #endif -/*********************************** Host *************************************/ -/* Functions for running a process in main() - * - * 1. create the maestro process - * 2. attach (create a context and wait for maestro to give control back to you) - * 3. do you process job - * 4. detach (this waits for the simulation to terminate) - */ - -#ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::attach() or sg_actor_attach()") XBT_PUBLIC smx_actor_t - SIMIX_process_attach(const char* name, void* data, const char* hostname, - std::unordered_map* properties, smx_actor_t parent_process); -#endif -SG_BEGIN_DECL() -XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::detach() or sg_actor_detach()") XBT_PUBLIC - void SIMIX_process_detach(); -SG_END_DECL() - /********************************* Process ************************************/ SG_BEGIN_DECL() 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_v325("Please use ActorImpl::set_user_data()") XBT_PUBLIC - void SIMIX_process_self_set_data(void* data); -XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::get_user_data()") XBT_PUBLIC void* SIMIX_process_self_get_data(); -XBT_ATTRIB_DEPRECATED_v325("Please manifest if you actually need this function") XBT_PUBLIC - int SIMIX_process_has_pending_comms(smx_actor_t process); -XBT_ATTRIB_DEPRECATED_v325("Please use SIMIX_process_on_exit(smx_actor_t, const std::function&)") XBT_PUBLIC - void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data); +XBT_PUBLIC void SIMIX_process_self_set_data(void* data); +XBT_PUBLIC void* SIMIX_process_self_get_data(); SG_END_DECL() #ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v325("Please use SIMIX_process_on_exit(smx_actor_t, const std::function&)") XBT_PUBLIC - void SIMIX_process_on_exit(smx_actor_t process, const std::function& fun, void* data); XBT_PUBLIC void SIMIX_process_on_exit(smx_actor_t process, const std::function& fun); #endif @@ -168,8 +135,6 @@ XBT_PUBLIC void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommI size_t buff_size); #endif -XBT_ATTRIB_DEPRECATED_v325("Please use CommImpl::finish()") XBT_PUBLIC void SIMIX_comm_finish(smx_activity_t synchro); - /******************************************************************************/ /* SIMIX simcalls */ /******************************************************************************/ @@ -180,18 +145,18 @@ XBT_ATTRIB_DEPRECATED_v325("Please use CommImpl::finish()") XBT_PUBLIC void SIMI /******************************* Host simcalls ********************************/ #ifdef __cplusplus XBT_PUBLIC e_smx_state_t simcall_execution_wait(const smx_activity_t& execution); -XBT_PUBLIC e_smx_state_t simcall_execution_test(const smx_activity_t& execution); +XBT_PUBLIC unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, + double timeout); +XBT_PUBLIC bool simcall_execution_test(const smx_activity_t& execution); #endif /**************************** Process simcalls ********************************/ SG_BEGIN_DECL() -XBT_ATTRIB_DEPRECATED_v324("Please use ActorImpl::throw_exception") XBT_PUBLIC - void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char* mesg); - void simcall_process_set_data(smx_actor_t process, void* data); -/* Process handling */ -XBT_PUBLIC void simcall_process_suspend(smx_actor_t process); -XBT_PUBLIC void simcall_process_join(smx_actor_t process, double timeout); +XBT_ATTRIB_DEPRECATED_v328("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process); + +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); @@ -211,7 +176,7 @@ XBT_PUBLIC smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t m int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), - void* data, int detached); + void* data, bool detached); XBT_PUBLIC void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), @@ -233,7 +198,7 @@ XBT_PUBLIC unsigned int simcall_comm_waitany(smx_activity_t comms[], size_t coun XBT_PUBLIC unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout); XBT_PUBLIC void simcall_comm_wait(const smx_activity_t& comm, double timeout); -XBT_PUBLIC int simcall_comm_test(const smx_activity_t& comm); +XBT_PUBLIC bool simcall_comm_test(const smx_activity_t& comm); XBT_PUBLIC int simcall_comm_testany(smx_activity_t comms[], size_t count); XBT_PUBLIC int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count); #endif @@ -262,30 +227,4 @@ SG_BEGIN_DECL() XBT_PUBLIC int simcall_mc_random(int min, int max); SG_END_DECL() -/***************************** DEPRECATED CALLS ****************************/ -SG_BEGIN_DECL() -XBT_ATTRIB_DEPRECATED_v325("Please use sg_actor_set_kill_time()") XBT_PUBLIC - void simcall_process_set_kill_time(smx_actor_t process, double kill_time); - -XBT_ATTRIB_DEPRECATED_v325("Please use Comm::cancel()") XBT_PUBLIC void simcall_comm_cancel(smx_activity_t comm); - -XBT_ATTRIB_DEPRECATED_v325("Please use Exec::cancel()") XBT_PUBLIC - void simcall_execution_cancel(smx_activity_t execution); -XBT_ATTRIB_DEPRECATED_v325("Please use Exec::set_priority()") XBT_PUBLIC - void simcall_execution_set_priority(smx_activity_t execution, double priority); -XBT_ATTRIB_DEPRECATED_v325("Please use Exec::set_bound()") XBT_PUBLIC - void simcall_execution_set_bound(smx_activity_t execution, double bound); -SG_END_DECL() - -#ifdef __cplusplus -XBT_ATTRIB_DEPRECATED_v325("Please use Exec::start()") XBT_PUBLIC smx_activity_t - simcall_execution_start(const std::string& name, const std::string& category, double flops_amount, double priority, - double bound, sg_host_t host); - -// Should be deprecated in v325 too but is still used in other deprecated calls -XBT_PUBLIC smx_activity_t simcall_execution_parallel_start(const std::string& name, int host_nb, - const sg_host_t* host_list, const double* flops_amount, - const double* bytes_amount, double rate, double timeout); -#endif - #endif