X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..2cdb13351fe9ef4d8b550c66cbbb5d70d7d9f30c:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 18451af516..647d9cd937 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -46,11 +46,6 @@ typedef enum { } e_smx_state_t; /** @} */ -/* ******************************** Synchro ************************************ */ - -/** @ingroup simix_synchro_management */ -typedef struct s_smx_sem_t* smx_sem_t; - /* ****************************** Process *********************************** */ typedef enum { @@ -60,14 +55,8 @@ typedef enum { /** @} */ /******************************* Networking ***********************************/ - -/* Process creation/destruction callbacks */ -typedef void (*void_pfn_smxprocess_t) (smx_actor_t); - extern unsigned smx_context_stack_size; -extern int smx_context_stack_size_was_set; extern unsigned smx_context_guard_size; -extern int smx_context_guard_size_was_set; SG_BEGIN_DECL() @@ -93,16 +82,10 @@ XBT_PUBLIC void SIMIX_global_init(int* argc, char** argv); * is assumed to be the maestro. */ XBT_PUBLIC void SIMIX_set_maestro(void (*code)(void*), void* data); -XBT_PUBLIC void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function); -XBT_PUBLIC void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function); - /* Simulation execution */ XBT_PUBLIC void SIMIX_run(); XBT_PUBLIC double SIMIX_get_clock(); -/* Timer functions FIXME: should these be public? */ -typedef struct s_smx_timer_t* smx_timer_t; - 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(); @@ -117,10 +100,6 @@ XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_load_platform()") XBT_PUBLIC void SIMIX_create_environment(const char* file); SG_END_DECL() -#ifdef __cplusplus -XBT_PUBLIC void SIMIX_create_environment(std::string file); -#endif - /******************************** Deployment **********************************/ SG_BEGIN_DECL() XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_register_function()") XBT_PUBLIC @@ -135,9 +114,9 @@ XBT_PUBLIC void SIMIX_process_set_function(const char* process_host, const char* SG_END_DECL() #ifdef __cplusplus -XBT_PUBLIC void SIMIX_function_register(std::string name, void (*code)(std::vector)); -XBT_PUBLIC void SIMIX_function_register(std::string name, xbt_main_func_t code); -XBT_PUBLIC void SIMIX_launch_application(std::string file); +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); #endif /*********************************** Host *************************************/ @@ -149,16 +128,14 @@ XBT_PUBLIC void SIMIX_launch_application(std::string file); * 4. detach (this waits for the simulation to terminate) */ -SG_BEGIN_DECL() -XBT_PUBLIC void SIMIX_maestro_create(void (*code)(void*), void* data); -SG_END_DECL() #ifdef __cplusplus -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); +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_PUBLIC void SIMIX_process_detach(); +XBT_ATTRIB_DEPRECATED_v325("Please use ActorImpl::detach() or sg_actor_detach()") XBT_PUBLIC + void SIMIX_process_detach(); SG_END_DECL() /********************************* Process ************************************/ @@ -169,7 +146,6 @@ XBT_PUBLIC const char* SIMIX_process_self_get_name(); XBT_PUBLIC void SIMIX_process_self_set_data(void* data); XBT_PUBLIC void* SIMIX_process_self_get_data(); XBT_PUBLIC int SIMIX_process_has_pending_comms(smx_actor_t process); -XBT_PUBLIC void SIMIX_process_on_exit_runall(smx_actor_t process); XBT_PUBLIC void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data); SG_END_DECL() @@ -178,11 +154,16 @@ XBT_PUBLIC void SIMIX_process_on_exit(smx_actor_t process, std::function* properties); -#endif - 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); - -/* Getters and Setters */ -XBT_PUBLIC void simcall_process_set_data(smx_actor_t process, void* data); -XBT_PUBLIC void simcall_process_set_kill_time(smx_actor_t process, double kill_time); 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() @@ -234,48 +201,44 @@ SG_END_DECL() XBT_PUBLIC void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout); + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, double timeout); XBT_PUBLIC smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, - int detached); + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, int 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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout, - double rate); + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, double timeout, double rate); XBT_PUBLIC smx_activity_t simcall_comm_irecv(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*), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, - double rate); + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, double rate); XBT_PUBLIC smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data); -#endif -XBT_PUBLIC void simcall_comm_cancel(smx_activity_t comm); /* FIXME: waitany is going to be a vararg function, and should take a timeout */ -XBT_PUBLIC unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout); -XBT_PUBLIC void simcall_comm_wait(smx_activity_t comm, double timeout); -XBT_PUBLIC int simcall_comm_test(smx_activity_t comm); -XBT_PUBLIC int simcall_comm_testany(smx_activity_t* comms, size_t count); - -/************************** Tracing handling **********************************/ -#ifdef __cplusplus -XBT_PUBLIC void simcall_set_category(smx_activity_t synchro, std::string category); +XBT_PUBLIC unsigned int simcall_comm_waitany(smx_activity_t comms[], size_t count, double timeout); +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 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 /************************** Synchro simcalls **********************************/ SG_BEGIN_DECL() XBT_PUBLIC smx_mutex_t simcall_mutex_init(); -XBT_PUBLIC smx_mutex_t SIMIX_mutex_ref(smx_mutex_t mutex); -XBT_PUBLIC void SIMIX_mutex_unref(smx_mutex_t mutex); XBT_PUBLIC void simcall_mutex_lock(smx_mutex_t mutex); XBT_PUBLIC int simcall_mutex_trylock(smx_mutex_t mutex); XBT_PUBLIC void simcall_mutex_unlock(smx_mutex_t mutex); @@ -284,15 +247,38 @@ 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 SIMIX_sem_destroy(smx_sem_t sem); XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem); XBT_PUBLIC int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration); +SG_END_DECL() /***************************** Io **************************************/ -XBT_PUBLIC e_smx_state_t simcall_io_wait(smx_activity_t io); +#ifdef __cplusplus +XBT_PUBLIC e_smx_state_t simcall_io_wait(const smx_activity_t& io); +#endif /************************** MC simcalls **********************************/ +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); +#endif + #endif