X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc16e9be4b22e327ec560d9b035197bd484db4e5..df078bae24388cc0dd63b2bbafe05897a0dd45f8:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 1af2dffb69..f599f48f17 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -12,7 +12,9 @@ #include #ifdef __cplusplus #include +#include #include +#include #endif /* ******************************** Host ************************************ */ @@ -26,7 +28,7 @@ some private data that can be only accessed by local process. - \see m_host_management + @see m_host_management @{ */ typedef enum { SIMIX_WAITING, @@ -46,9 +48,7 @@ typedef enum { /* ******************************** Synchro ************************************ */ -/** - * \ingroup simix_synchro_management - */ +/** @ingroup simix_synchro_management */ typedef struct s_smx_sem_t* smx_sem_t; /* ****************************** Process *********************************** */ @@ -60,10 +60,6 @@ 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; @@ -93,9 +89,6 @@ 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(); @@ -113,7 +106,8 @@ SG_END_DECL() /******************************* Environment **********************************/ SG_BEGIN_DECL() -XBT_PUBLIC void SIMIX_create_environment(const char* file); +XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_load_platform()") XBT_PUBLIC + void SIMIX_create_environment(const char* file); SG_END_DECL() #ifdef __cplusplus @@ -122,16 +116,19 @@ XBT_PUBLIC void SIMIX_create_environment(std::string file); /******************************** Deployment **********************************/ SG_BEGIN_DECL() -XBT_PUBLIC void SIMIX_function_register(const char* name, xbt_main_func_t code); +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(); -XBT_PUBLIC void SIMIX_launch_application(const char* file); +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); 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); #endif @@ -188,11 +185,13 @@ XBT_PUBLIC void SIMIX_comm_finish(smx_activity_t synchro); /******************************************************************************/ /******************************* Host simcalls ********************************/ -XBT_PUBLIC smx_activity_t simcall_execution_start(const char* name, double flops_amount, double priority, double bound, - sg_host_t host); -XBT_PUBLIC smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, +#ifdef __cplusplus +XBT_PUBLIC smx_activity_t simcall_execution_start(std::string name, std::string category, double flops_amount, + double priority, double bound, sg_host_t host); +XBT_PUBLIC smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout); +#endif XBT_PUBLIC void simcall_execution_cancel(smx_activity_t execution); XBT_PUBLIC void simcall_execution_set_priority(smx_activity_t execution, double priority); XBT_PUBLIC void simcall_execution_set_bound(smx_activity_t execution, double bound); @@ -200,15 +199,9 @@ XBT_PUBLIC e_smx_state_t simcall_execution_wait(smx_activity_t execution); XBT_PUBLIC e_smx_state_t simcall_execution_test(smx_activity_t execution); /**************************** Process simcalls ********************************/ -/* Constructor and Destructor */ -#ifdef __cplusplus -XBT_PUBLIC smx_actor_t simcall_process_create(std::string name, xbt_main_func_t code, void* data, sg_host_t host, - int argc, char** argv, - std::unordered_map* properties); -#endif - SG_BEGIN_DECL() -XBT_PUBLIC void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char* mesg); +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); /* Process handling */ XBT_PUBLIC void simcall_process_suspend(smx_actor_t process); @@ -260,7 +253,9 @@ 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 **********************************/ -XBT_PUBLIC void simcall_set_category(smx_activity_t synchro, const char* category); +#ifdef __cplusplus +XBT_PUBLIC void simcall_set_category(smx_activity_t synchro, std::string category); +#endif /************************** Synchro simcalls **********************************/ SG_BEGIN_DECL() @@ -279,9 +274,8 @@ 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); -/***************************** Storage **********************************/ -XBT_PUBLIC sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size); -XBT_PUBLIC sg_size_t simcall_storage_write(surf_storage_t fd, sg_size_t size); +/***************************** Io **************************************/ +XBT_PUBLIC e_smx_state_t simcall_io_wait(smx_activity_t io); /************************** MC simcalls **********************************/ XBT_PUBLIC int simcall_mc_random(int min, int max);