X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89df6a48741330160c27b692f6fbfc213db31cbe..d9cad55dcc546b3936c278258e7f463ac70066df:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index dd7c38c4c9..c0b5c6ccd0 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -9,7 +9,6 @@ #include "xbt.h" #include "msg/datatypes.h" -#include "xbt/automaton.h" #include "simgrid/simix.h" @@ -35,11 +34,29 @@ typedef enum { /************************** Global ******************************************/ XBT_PUBLIC(void) MSG_config(const char *name, ...); -XBT_PUBLIC(void) MSG_global_init(int *argc, char **argv); -XBT_PUBLIC(void) MSG_global_init_args(int *argc, char **argv); +/** \ingroup msg_simulation + * \brief Initialize the MSG internal data. + * \hideinitializer + * + * It also check that the link-time and compile-time versions of SimGrid do + * match, so you should use this version instead of the #MSG_init_nocheck + * function that does the same initializations, but without this check. + * + * We allow to link against compiled versions that differ in the patch level. + */ +#define MSG_init(argc,argv) { \ + int ver_major,ver_minor,ver_patch; \ + sg_version(&ver_major,&ver_minor,&ver_patch); \ + if ((ver_major != SIMGRID_VERSION_MAJOR) || \ + (ver_minor != SIMGRID_VERSION_MINOR)) { \ + fprintf(stderr,"FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, and then linked against SimGrid %d.%d.%d. Please fix this.\n", \ + SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,ver_major,ver_minor,ver_patch); \ + } \ + MSG_init_nocheck(argc,argv); \ + } + +XBT_PUBLIC(void) MSG_init_nocheck(int *argc, char **argv); XBT_PUBLIC(MSG_error_t) MSG_main(void); -XBT_PUBLIC(MSG_error_t) MSG_main_stateful(void); -XBT_PUBLIC(MSG_error_t) MSG_main_liveness(xbt_automaton_t a); XBT_PUBLIC(MSG_error_t) MSG_clean(void); XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code); @@ -56,7 +73,7 @@ XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); /************************** File handling ***********************************/ -XBT_PUBLIC(size_t) MSG_file_read(void* ptr, size_t size, size_t nmemb, msg_file_t stream); +XBT_PUBLIC(double) MSG_file_read(void* ptr, size_t size, size_t nmemb, msg_file_t stream); XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, size_t nmemb, msg_file_t stream); XBT_PUBLIC(msg_file_t) MSG_file_open(const char* mount, const char* path, const char* mode); XBT_PUBLIC(int) MSG_file_close(msg_file_t fp); @@ -78,6 +95,10 @@ XBT_PUBLIC(void) __MSG_host_destroy(m_host_t host); XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(m_host_t host); XBT_PUBLIC(const char *) MSG_host_get_property_value(m_host_t host, const char *name); +XBT_PUBLIC(void) MSG_host_set_property_value(m_host_t host, + const char *name, char *value, + void_f_pvoid_t free_ctn); + XBT_PUBLIC(void) MSG_create_environment(const char *file); XBT_PUBLIC(void) MSG_load_platform_script(const char *script_file); @@ -86,16 +107,16 @@ XBT_PUBLIC(m_host_t) MSG_get_host_by_name(const char *name); XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(void); /************************** Process handling *********************************/ -XBT_PUBLIC(m_process_t) MSG_process_create(const char *name, +XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, xbt_main_func_t code, void *data, m_host_t host); -XBT_PUBLIC(m_process_t) MSG_process_create_with_arguments(const char *name, +XBT_PUBLIC(msg_process_t) MSG_process_create_with_arguments(const char *name, xbt_main_func_t code, void *data, m_host_t host, int argc, char **argv); -XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char +XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char *name, xbt_main_func_t code, @@ -105,35 +126,37 @@ XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char char **argv, xbt_dict_t properties); -XBT_PUBLIC(void) MSG_process_kill(m_process_t process); +XBT_PUBLIC(void) MSG_process_kill(msg_process_t process); XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs); -XBT_PUBLIC(MSG_error_t) MSG_process_migrate(m_process_t process, m_host_t host); +XBT_PUBLIC(MSG_error_t) MSG_process_migrate(msg_process_t process, m_host_t host); -XBT_PUBLIC(void *) MSG_process_get_data(m_process_t process); -XBT_PUBLIC(MSG_error_t) MSG_process_set_data(m_process_t process, +XBT_PUBLIC(void *) MSG_process_get_data(msg_process_t process); +XBT_PUBLIC(MSG_error_t) MSG_process_set_data(msg_process_t process, void *data); XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); -XBT_PUBLIC(m_host_t) MSG_process_get_host(m_process_t process); -XBT_PUBLIC(m_process_t) MSG_process_from_PID(int PID); -XBT_PUBLIC(int) MSG_process_get_PID(m_process_t process); -XBT_PUBLIC(int) MSG_process_get_PPID(m_process_t process); -XBT_PUBLIC(const char *) MSG_process_get_name(m_process_t process); +XBT_PUBLIC(m_host_t) MSG_process_get_host(msg_process_t process); +XBT_PUBLIC(msg_process_t) MSG_process_from_PID(int PID); +XBT_PUBLIC(int) MSG_process_get_PID(msg_process_t process); +XBT_PUBLIC(int) MSG_process_get_PPID(msg_process_t process); +XBT_PUBLIC(const char *) MSG_process_get_name(msg_process_t process); XBT_PUBLIC(int) MSG_process_self_PID(void); XBT_PUBLIC(int) MSG_process_self_PPID(void); -XBT_PUBLIC(m_process_t) MSG_process_self(void); +XBT_PUBLIC(msg_process_t) MSG_process_self(void); XBT_PUBLIC(xbt_dynar_t) MSG_processes_as_dynar(void); -XBT_PUBLIC(MSG_error_t) MSG_process_set_kill_time(m_process_t process, double kill_time); +XBT_PUBLIC(MSG_error_t) MSG_process_set_kill_time(msg_process_t process, double kill_time); /*property handlers*/ -XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process); -XBT_PUBLIC(const char *) MSG_process_get_property_value(m_process_t +XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(msg_process_t process); +XBT_PUBLIC(const char *) MSG_process_get_property_value(msg_process_t process, const char *name); -XBT_PUBLIC(MSG_error_t) MSG_process_suspend(m_process_t process); -XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process); -XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process); +XBT_PUBLIC(MSG_error_t) MSG_process_suspend(msg_process_t process); +XBT_PUBLIC(MSG_error_t) MSG_process_resume(msg_process_t process); +XBT_PUBLIC(int) MSG_process_is_suspended(msg_process_t process); +XBT_PUBLIC(void) MSG_process_on_exit(int_f_pvoid_t fun, void *data); +XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart); /************************** Task handling ************************************/ XBT_PUBLIC(m_task_t) MSG_task_create(const char *name, @@ -152,8 +175,8 @@ XBT_PUBLIC(m_task_t) MSG_parallel_task_create(const char *name, XBT_PUBLIC(void *) MSG_task_get_data(m_task_t task); XBT_PUBLIC(void) MSG_task_set_data(m_task_t task, void *data); XBT_PUBLIC(void) MSG_task_set_copy_callback(void (*callback) ( - m_task_t task, m_process_t src, m_process_t dst)); -XBT_PUBLIC(m_process_t) MSG_task_get_sender(m_task_t task); + m_task_t task, msg_process_t src, msg_process_t dst)); +XBT_PUBLIC(msg_process_t) MSG_task_get_sender(m_task_t task); XBT_PUBLIC(m_host_t) MSG_task_get_source(m_task_t task); XBT_PUBLIC(const char *) MSG_task_get_name(m_task_t task); XBT_PUBLIC(void) MSG_task_set_name(m_task_t task, const char *name); @@ -241,6 +264,9 @@ XBT_PUBLIC(MSG_error_t) MSG_error_t MSG_action_trace_run(char *path); #ifdef MSG_USE_DEPRECATED +#define MSG_global_init(argc, argv) MSG_init(argc,argv) +#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(m_host_t *) MSG_get_host_table(void); @@ -297,8 +323,8 @@ XBT_PUBLIC(msg_vm_t) MSG_vm_start(m_host_t location, int coreAmount); XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t); XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t); -XBT_PUBLIC(void) MSG_vm_bind(msg_vm_t vm, m_process_t process); -XBT_PUBLIC(void) MSG_vm_unbind(msg_vm_t vm, m_process_t process); // simple wrapper over process_kill +XBT_PUBLIC(void) MSG_vm_bind(msg_vm_t vm, msg_process_t process); +XBT_PUBLIC(void) MSG_vm_unbind(msg_vm_t vm, msg_process_t process); // simple wrapper over process_kill XBT_PUBLIC(void) MSG_vm_migrate(msg_vm_t vm, m_host_t destination); @@ -310,6 +336,8 @@ XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); // Simulate the fact of reading th XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); // killall +XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); + XBT_PUBLIC(xbt_dynar_t) MSG_vms_as_dynar(void); /* @@ -335,7 +363,7 @@ 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(m_process_t process); +XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(msg_process_t process); SG_END_DECL() #endif