X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc16e9be4b22e327ec560d9b035197bd484db4e5..37dcfafac51a942b0219878f2a329b0db83e2ba7:/include/simgrid/simix.h
diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 1af2dffb69..d2eeb7becf 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -26,7 +26,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 +46,7 @@ typedef enum {
/* ******************************** Synchro ************************************ */
-/**
- * \ingroup simix_synchro_management
- */
+/** @ingroup simix_synchro_management */
typedef struct s_smx_sem_t* smx_sem_t;
/* ****************************** Process *********************************** */
@@ -113,7 +111,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 +121,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 +189,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);
@@ -200,6 +203,7 @@ 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 ********************************/
+SG_BEGIN_DECL()
/* 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,
@@ -207,7 +211,6 @@ XBT_PUBLIC smx_actor_t simcall_process_create(std::string name, xbt_main_func_t
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);
/* Process handling */