X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc16e9be4b22e327ec560d9b035197bd484db4e5..d0deeb7395b0acb0b56550d62bc26df529779ef4:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 1af2dffb69..bef172b811 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -113,7 +113,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,11 +123,13 @@ 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() @@ -188,11 +191,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, +#ifdef __cplusplus +XBT_PUBLIC smx_activity_t simcall_execution_start(std::string 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, +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);