X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..e329e2e6aa39ca2d2317ddd4b9ea83250ac98f8e:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index db8f5dc34e..6eca9b18e6 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -46,14 +46,6 @@ typedef enum { } e_smx_state_t; /** @} */ -/* ****************************** Process *********************************** */ - -typedef enum { - SMX_EXIT_SUCCESS = 0, - SMX_EXIT_FAILURE = 1 -} smx_process_exit_status_t; -/** @} */ - /******************************* Networking ***********************************/ extern unsigned smx_context_stack_size; extern unsigned smx_context_guard_size; @@ -86,10 +78,13 @@ 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() @@ -109,42 +104,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 @@ -158,8 +127,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 */ /******************************************************************************/ @@ -178,16 +145,16 @@ XBT_PUBLIC bool simcall_execution_test(const smx_activity_t& execution); /**************************** Process simcalls ********************************/ SG_BEGIN_DECL() void simcall_process_set_data(smx_actor_t process, void* data); -XBT_ATTRIB_DEPRECATED_v327("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process); +XBT_ATTRIB_DEPRECATED_v328("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process); -XBT_ATTRIB_DEPRECATED_v327("Please use Actor::join()") XBT_PUBLIC +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); SG_END_DECL() -/************************** Comunication simcalls *****************************/ +/************************** Communication simcalls ****************************/ #ifdef __cplusplus XBT_PUBLIC void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, @@ -252,28 +219,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_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 sharing_penalty, 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