X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6dde5ff6f208b83545a4b4e9e81712d0d8617a1..4b0fa756ae6e58a74c374a519389ecb9e8b6a4d9:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 1740dd5932..c9045ad713 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -7,7 +7,7 @@ #define SIMGRID_SIMIX_H #include -#include +#include #include #include #ifdef __cplusplus @@ -29,8 +29,6 @@ XBT_PUBLIC smx_actor_t SIMIX_process_from_PID(aid_t PID); 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 int SIMIX_context_get_parallel_threshold(); -XBT_PUBLIC void SIMIX_context_set_parallel_threshold(int threshold); 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(); @@ -39,7 +37,7 @@ XBT_PUBLIC int SIMIX_is_maestro(); /* Initialization and exit */ XBT_PUBLIC void SIMIX_global_init(int* argc, char** argv); -/* Set to execute in the maestro +/* 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. */ @@ -114,33 +112,35 @@ XBT_PUBLIC void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommI /******************************* Host simcalls ********************************/ #ifdef __cplusplus -XBT_PUBLIC e_smx_state_t 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(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_PUBLIC bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution); +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 + bool simcall_execution_test(const simgrid::kernel::activity::ActivityImplPtr& execution); -XBT_ATTRIB_DEPRECATED_v330("Please use an ActivityImpl* for first parameter") inline e_smx_state_t - simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution, double timeout) -{ - return simcall_execution_wait(execution.get(), timeout); -} -XBT_ATTRIB_DEPRECATED_v330("Please use an ActivityImpl* for first parameter") inline bool simcall_execution_test( - const simgrid::kernel::activity::ActivityImplPtr& execution) -{ - return simcall_execution_test(execution.get()); -} #endif /**************************** 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 Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process); +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 Actor::join()") XBT_PUBLIC +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("Please use sg_actor_sleep_for()") XBT_PUBLIC e_smx_state_t +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 @@ -169,11 +169,10 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double rate); -XBT_PUBLIC simgrid::kernel::activity::ActivityImplPtr -simcall_comm_iprobe(smx_mailbox_t mbox, int type, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), - void* data); +XBT_ATTRIB_DEPRECATED_v330("Please use Mailbox::iprobe()") XBT_PUBLIC simgrid::kernel::activity::ActivityImplPtr + simcall_comm_iprobe(smx_mailbox_t mbox, int type, + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data); -/* FIXME: waitany is going to be a vararg function, and should take a timeout */ XBT_ATTRIB_DEPRECATED_v330("Please use a CommImpl*[] for first parameter") XBT_PUBLIC unsigned int simcall_comm_waitany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count, double timeout); XBT_PUBLIC unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, @@ -198,12 +197,12 @@ XBT_ATTRIB_DEPRECATED_v330("Please use a ActivityImpl* for first parameter") inl /************************** Synchro simcalls **********************************/ SG_BEGIN_DECL -XBT_PUBLIC smx_mutex_t simcall_mutex_init(); +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_PUBLIC int simcall_mutex_trylock(smx_mutex_t mutex); XBT_PUBLIC void simcall_mutex_unlock(smx_mutex_t mutex); -XBT_PUBLIC smx_cond_t simcall_cond_init(); +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); @@ -213,20 +212,14 @@ SG_END_DECL /***************************** Io **************************************/ #ifdef __cplusplus -XBT_PUBLIC e_smx_state_t simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io, double timeout); -XBT_PUBLIC bool simcall_io_test(simgrid::kernel::activity::ActivityImpl* io); - -XBT_ATTRIB_DEPRECATED_v330("Please use an ActivityImpl* for first parameter") inline e_smx_state_t - simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io, double timeout) -{ - return simcall_io_wait(io.get(), timeout); -} -XBT_ATTRIB_DEPRECATED_v330("Please use an ActivityImpl* for first parameter") inline bool simcall_io_test( - const simgrid::kernel::activity::ActivityImplPtr& io) -{ - return simcall_io_test(io.get()); -} - +XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Io::wait_for()") XBT_PUBLIC simgrid::kernel::activity::State + simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io, double timeout); +XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Io::wait_for()") XBT_PUBLIC simgrid::kernel::activity::State + simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io, double timeout); +XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Io::test()") XBT_PUBLIC + bool simcall_io_test(simgrid::kernel::activity::ActivityImpl* io); +XBT_ATTRIB_DEPRECATED_v330("Please use s4u::Io::test()") XBT_PUBLIC + bool simcall_io_test(const simgrid::kernel::activity::ActivityImplPtr& io); #endif /************************** MC simcalls **********************************/ SG_BEGIN_DECL