X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/089f7e843d3f07571c398fb880550fdc6ff3c8e1..88425d917174073213cea8943fa31eb0049cb84d:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index fdfda0f8e7..5d993b0f40 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -32,7 +32,7 @@ typedef enum { /** @} */ /************************** Global ******************************************/ -XBT_PUBLIC(void) MSG_config(const char *name, ...); +XBT_PUBLIC(void) MSG_config(const char *key, const char *value); /** \ingroup msg_simulation * \brief Initialize the MSG internal data. * \hideinitializer @@ -56,7 +56,6 @@ XBT_PUBLIC(void) MSG_config(const char *name, ...); XBT_PUBLIC(void) MSG_init_nocheck(int *argc, char **argv); XBT_PUBLIC(msg_error_t) MSG_main(void); -XBT_PUBLIC(msg_error_t) MSG_clean(void); XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code); XBT_PUBLIC(void) MSG_function_register_default(xbt_main_func_t code); @@ -112,6 +111,7 @@ XBT_PUBLIC(void) MSG_load_platform_script(const char *script_file); XBT_PUBLIC(msg_host_t) MSG_get_host_by_name(const char *name); XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(void); +XBT_PUBLIC(int) MSG_get_host_number(void); /************************** Process handling *********************************/ XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, @@ -151,6 +151,8 @@ XBT_PUBLIC(int) MSG_process_self_PID(void); XBT_PUBLIC(int) MSG_process_self_PPID(void); XBT_PUBLIC(msg_process_t) MSG_process_self(void); XBT_PUBLIC(xbt_dynar_t) MSG_processes_as_dynar(void); +XBT_PUBLIC(int) MSG_process_get_number(void); + XBT_PUBLIC(msg_error_t) MSG_process_set_kill_time(msg_process_t process, double kill_time); /*property handlers*/ @@ -273,7 +275,7 @@ void MSG_mailbox_set_async(const char *alias); /************************** Action handling **********************************/ -msg_error_t MSG_action_trace_run(char *path); +XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path); #ifdef MSG_USE_DEPRECATED @@ -283,7 +285,6 @@ typedef msg_error_t MSG_error_t; #define MSG_global_init_args(argc, argv) MSG_init(argc,argv) /* these are the functions which are deprecated. Do not use them, they may get removed in future releases */ -XBT_PUBLIC(int) MSG_get_host_number(void); XBT_PUBLIC(msg_host_t *) MSG_get_host_table(void); #define MSG_TIMEOUT_FAILURE MSG_TIMEOUT @@ -294,6 +295,8 @@ XBT_PUBLIC(msg_host_t *) MSG_get_host_table(void); #define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h); XBT_PUBLIC(msg_error_t) MSG_get_errno(void); +XBT_PUBLIC(msg_error_t) MSG_clean(void); + XBT_PUBLIC(msg_error_t) MSG_task_get(msg_task_t * task, m_channel_t channel); XBT_PUBLIC(msg_error_t) MSG_task_get_with_timeout(msg_task_t * task, m_channel_t channel, @@ -382,5 +385,11 @@ xbt_dynar_t MSG_vm_get_list_from_hosts(msg_dynar_t) /* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */ XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(msg_process_t process); +/* ****************************************************************************************** */ +/* TUTORIAL: New API */ +/* Declare all functions for the API */ +/* ****************************************************************************************** */ +XBT_PUBLIC(int) MSG_new_API_fct(const char* param1, double param2); + SG_END_DECL() #endif