X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2c89401822ce6edf5d891533da3c77d633186ac..db82f9e75280108116a8e70d2e7a163080020d29:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index 99888863ad..657a35792c 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -28,12 +28,11 @@ typedef enum { running has just been rebooted. Free your datastructures and return now !*/ MSG_TASK_CANCELED = 8 /**< @brief Canceled task. This task has been canceled by somebody!*/ -} MSG_error_t; +} msg_error_t; /** @} */ - /************************** 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 @@ -44,20 +43,19 @@ XBT_PUBLIC(void) MSG_config(const char *name, ...); * * 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); \ - } +#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_clean(void); +XBT_PUBLIC(msg_error_t) MSG_main(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); @@ -71,6 +69,11 @@ XBT_PUBLIC(void) MSG_set_function(const char *host_id, XBT_PUBLIC(double) MSG_get_clock(void); XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); +/************************** Environment ***********************************/ +XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root(void); +XBT_PUBLIC(const char *) MSG_environment_as_get_name(msg_as_t as); +XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_as_t as); +XBT_PUBLIC(const char *)MSG_environment_as_get_property_value(msg_as_t as, const char *name); /************************** File handling ***********************************/ XBT_PUBLIC(double) MSG_file_read(void* ptr, size_t size, size_t nmemb, msg_file_t stream); @@ -78,10 +81,18 @@ XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, size_t nmemb, ms 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); XBT_PUBLIC(int) MSG_file_stat(msg_file_t fd, s_msg_stat_t *buf); +XBT_PUBLIC(void) MSG_file_free_stat(s_msg_stat_t *stat); + +XBT_PUBLIC(int) MSG_file_unlink(msg_file_t fd); +XBT_PUBLIC(xbt_dict_t) MSG_file_ls(const char *mount, const char *path); +/************************** AS Router handling ************************************/ +XBT_PUBLIC(const char *) MSG_as_router_get_property_value(const char* asr, const char *name); +XBT_PUBLIC(xbt_dict_t) MSG_as_router_get_properties(const char* asr); +XBT_PUBLIC(void) MSG_as_router_set_property_value(const char* asr, const char *name, char *value,void_f_pvoid_t free_ctn); /************************** Host handling ***********************************/ -XBT_PUBLIC(MSG_error_t) MSG_host_set_data(msg_host_t host, void *data); +XBT_PUBLIC(msg_error_t) MSG_host_set_data(msg_host_t host, void *data); XBT_PUBLIC(void *) MSG_host_get_data(msg_host_t host); XBT_PUBLIC(const char *) MSG_host_get_name(msg_host_t host); XBT_PUBLIC(msg_host_t) MSG_host_self(void); @@ -89,6 +100,7 @@ XBT_PUBLIC(int) MSG_get_host_msgload(msg_host_t host); /* int MSG_get_msgload(void); This function lacks specification; discard it */ XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_avail(msg_host_t h); +XBT_PUBLIC(void) __MSG_host_priv_free(msg_host_priv_t priv); XBT_PUBLIC(void) __MSG_host_destroy(msg_host_t host); /*property handlers*/ @@ -101,10 +113,13 @@ XBT_PUBLIC(void) MSG_host_set_property_value(msg_host_t host, XBT_PUBLIC(void) MSG_create_environment(const char *file); -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); + +XBT_PUBLIC(void) MSG_host_get_params(msg_host_t ind_pm, ws_params_t params); +XBT_PUBLIC(void) MSG_host_set_params(msg_host_t ind_pm, ws_params_t params); /************************** Process handling *********************************/ XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, @@ -129,10 +144,10 @@ XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char 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(msg_process_t process, msg_host_t host); +XBT_PUBLIC(msg_error_t) MSG_process_migrate(msg_process_t process, msg_host_t host); XBT_PUBLIC(void *) MSG_process_get_data(msg_process_t process); -XBT_PUBLIC(MSG_error_t) MSG_process_set_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(msg_host_t) MSG_process_get_host(msg_process_t process); @@ -144,7 +159,9 @@ 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(MSG_error_t) MSG_process_set_kill_time(msg_process_t process, double kill_time); +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*/ XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(msg_process_t process); @@ -152,12 +169,14 @@ XBT_PUBLIC(const char *) MSG_process_get_property_value(msg_process_t process, const char *name); -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(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); +XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process); + /************************** Task handling ************************************/ XBT_PUBLIC(msg_task_t) MSG_task_create(const char *name, double compute_duration, @@ -180,70 +199,97 @@ XBT_PUBLIC(msg_process_t) MSG_task_get_sender(msg_task_t task); XBT_PUBLIC(msg_host_t) MSG_task_get_source(msg_task_t task); XBT_PUBLIC(const char *) MSG_task_get_name(msg_task_t task); XBT_PUBLIC(void) MSG_task_set_name(msg_task_t task, const char *name); -XBT_PUBLIC(MSG_error_t) MSG_task_cancel(msg_task_t task); -XBT_PUBLIC(MSG_error_t) MSG_task_destroy(msg_task_t task); +XBT_PUBLIC(msg_error_t) MSG_task_cancel(msg_task_t task); +XBT_PUBLIC(msg_error_t) MSG_task_destroy(msg_task_t task); -XBT_PUBLIC(MSG_error_t) MSG_task_receive_from_host(msg_task_t * task, const char *alias, +XBT_PUBLIC(msg_error_t) MSG_task_receive_from_host(msg_task_t * task, const char *alias, msg_host_t host); +XBT_PUBLIC(msg_error_t) MSG_task_receive_from_host_bounded(msg_task_t * task, const char *alias, + msg_host_t host, double rate); -XBT_PUBLIC(MSG_error_t) MSG_task_execute(msg_task_t task); -XBT_PUBLIC(MSG_error_t) MSG_parallel_task_execute(msg_task_t task); +XBT_PUBLIC(msg_error_t) MSG_task_execute(msg_task_t task); +XBT_PUBLIC(msg_error_t) MSG_parallel_task_execute(msg_task_t task); XBT_PUBLIC(void) MSG_task_set_priority(msg_task_t task, double priority); +XBT_PUBLIC(void) MSG_task_set_bound(msg_task_t task, double bound); -XBT_PUBLIC(MSG_error_t) MSG_process_sleep(double nb_sec); +XBT_PUBLIC(msg_error_t) MSG_process_sleep(double nb_sec); XBT_PUBLIC(double) MSG_task_get_compute_duration(msg_task_t task); XBT_PUBLIC(void) MSG_task_set_compute_duration(msg_task_t task, double compute_duration); +XBT_PUBLIC(void) MSG_task_set_data_size(msg_task_t task, + double data_size); + XBT_PUBLIC(double) MSG_task_get_remaining_computation(msg_task_t task); XBT_PUBLIC(double) MSG_task_get_remaining_communication(msg_task_t task); XBT_PUBLIC(int) MSG_task_is_latency_bounded(msg_task_t task); XBT_PUBLIC(double) MSG_task_get_data_size(msg_task_t task); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, msg_host_t host); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, double timeout); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) MSG_task_receive(msg_task_t * task, const char *alias); #define MSG_task_recv(t,a) MSG_task_receive(t,a) + + +XBT_PUBLIC(msg_error_t) + MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, double timeout, + msg_host_t host, double rate); + +XBT_PUBLIC(msg_error_t) + MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char *alias, + double timeout, double rate); + +XBT_PUBLIC(msg_error_t) + MSG_task_receive_bounded(msg_task_t * task, const char *alias,double rate); +#define MSG_task_recv_bounded(t,a,r) MSG_task_receive_bounded(t,a,r) + XBT_PUBLIC(msg_comm_t) MSG_task_isend(msg_task_t task, const char *alias); +XBT_PUBLIC(msg_comm_t) MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate); XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(msg_task_t task, const char *alias, int (*match_fun)(void*,void*, smx_action_t), void *match_data); XBT_PUBLIC(void) MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup); +XBT_PUBLIC(void) MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate); XBT_PUBLIC(msg_comm_t) MSG_task_irecv(msg_task_t * task, const char *alias); +XBT_PUBLIC(msg_comm_t) MSG_task_irecv_bounded(msg_task_t * task, const char *alias, double rate); XBT_PUBLIC(int) MSG_comm_test(msg_comm_t comm); XBT_PUBLIC(int) MSG_comm_testany(xbt_dynar_t comms); XBT_PUBLIC(void) MSG_comm_destroy(msg_comm_t comm); -XBT_PUBLIC(MSG_error_t) MSG_comm_wait(msg_comm_t comm, double timeout); +XBT_PUBLIC(msg_error_t) MSG_comm_wait(msg_comm_t comm, double timeout); XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout); XBT_PUBLIC(int) MSG_comm_waitany(xbt_dynar_t comms); XBT_PUBLIC(msg_task_t) MSG_comm_get_task(msg_comm_t comm); -XBT_PUBLIC(MSG_error_t) MSG_comm_get_status(msg_comm_t comm); +XBT_PUBLIC(msg_error_t) MSG_comm_get_status(msg_comm_t comm); XBT_PUBLIC(int) MSG_task_listen(const char *alias); XBT_PUBLIC(int) MSG_task_listen_from_host(const char *alias, msg_host_t host); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) + MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alias, + double timeout, double maxrate); + +XBT_PUBLIC(msg_error_t) MSG_task_send(msg_task_t task, const char *alias); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) MSG_task_send_bounded(msg_task_t task, const char *alias, double rate); XBT_PUBLIC(int) MSG_task_listen_from(const char *alias); @@ -252,23 +298,32 @@ XBT_PUBLIC(void) MSG_task_set_category (msg_task_t task, const char *category); XBT_PUBLIC(const char *) MSG_task_get_category (msg_task_t task); /************************** Task handling ************************************/ -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t * task, msg_host_t host, double timeout); -XBT_PUBLIC(MSG_error_t) +XBT_PUBLIC(msg_error_t) + MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *task, + msg_host_t host, double timeout, double rate); + +XBT_PUBLIC(msg_error_t) MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task, double timeout); +XBT_PUBLIC(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 + +typedef msg_error_t MSG_error_t; + #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(msg_host_t *) MSG_get_host_table(void); #define MSG_TIMEOUT_FAILURE MSG_TIMEOUT @@ -277,24 +332,26 @@ XBT_PUBLIC(msg_host_t *) MSG_get_host_table(void); MSG_mailbox_put_with_timeout(mailbox, task, timeout) #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_get_errno(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, +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, double max_duration); -XBT_PUBLIC(MSG_error_t) MSG_task_get_from_host(msg_task_t * task, +XBT_PUBLIC(msg_error_t) MSG_task_get_from_host(msg_task_t * task, int channel, msg_host_t host); -XBT_PUBLIC(MSG_error_t) MSG_task_get_ext(msg_task_t * task, int channel, +XBT_PUBLIC(msg_error_t) MSG_task_get_ext(msg_task_t * task, int channel, double max_duration, msg_host_t host); -XBT_PUBLIC(MSG_error_t) MSG_task_put(msg_task_t task, msg_host_t dest, +XBT_PUBLIC(msg_error_t) MSG_task_put(msg_task_t task, msg_host_t dest, m_channel_t channel); -XBT_PUBLIC(MSG_error_t) MSG_task_put_bounded(msg_task_t task, +XBT_PUBLIC(msg_error_t) MSG_task_put_bounded(msg_task_t task, msg_host_t dest, m_channel_t channel, double max_rate); -XBT_PUBLIC(MSG_error_t) MSG_task_put_with_timeout(msg_task_t task, +XBT_PUBLIC(msg_error_t) MSG_task_put_with_timeout(msg_task_t task, msg_host_t dest, m_channel_t channel, double max_duration); @@ -302,12 +359,10 @@ XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, msg_host_t host); -XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number); +XBT_PUBLIC(msg_error_t) MSG_set_channel_number(int number); XBT_PUBLIC(int) MSG_get_channel_number(void); #endif -#include "instr/instr.h" - /** @brief Opaque type describing a Virtual Machine. * @ingroup msg_VMs * @@ -316,29 +371,46 @@ XBT_PUBLIC(int) MSG_get_channel_number(void); * Usual lack of guaranty of any kind applies here, and is even increased. * */ -typedef struct msg_vm *msg_vm_t; -/* This function should not be called directly, but rather from MSG_vm_start_from_template that does not exist yet*/ -XBT_PUBLIC(msg_vm_t) MSG_vm_start(msg_host_t location, int coreAmount); -XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_created(msg_vm_t); XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_migrating(msg_vm_t); + +XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_saving(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_saved(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_restoring(msg_vm_t); + + +XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t); -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 +// TODO add VDI later +XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name); +XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t ind_pm, const char *name, + int core_nb, long mem_cap, long net_cap, char *disk_path, long disk_size); + +XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); + +XBT_PUBLIC(void) MSG_vm_start(msg_vm_t); + +/* Shutdown the guest operating system. */ +XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); XBT_PUBLIC(void) MSG_vm_migrate(msg_vm_t vm, msg_host_t destination); +/* Suspend the execution of the VM, but keep its state on memory. */ XBT_PUBLIC(void) MSG_vm_suspend(msg_vm_t vm); - // \forall p in VM, MSG_process_suspend(p) // Freeze the processes +XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); // Simulate the fact of reading the processes from disk and resuming them - // \forall p in VM, MSG_process_resume(p) // unfreeze them +/* Save the VM state to a disk. */ +XBT_PUBLIC(void) MSG_vm_save(msg_vm_t vm); +XBT_PUBLIC(void) MSG_vm_restore(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); // killall +XBT_PUBLIC(msg_host_t) MSG_vm_get_pm(msg_vm_t vm); +XBT_PUBLIC(void) MSG_vm_set_bound(msg_vm_t vm, double bound); -XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); - -XBT_PUBLIC(xbt_dynar_t) MSG_vms_as_dynar(void); +/* TODO: do we need this? */ +// XBT_PUBLIC(xbt_dynar_t) MSG_vms_as_dynar(void); /* void* MSG_process_get_property(msg_process_t, char* key) @@ -359,11 +431,19 @@ xbt_dynar_t MSG_vm_get_list_from_host(msg_host_t) xbt_dynar_t MSG_vm_get_list_from_hosts(msg_dynar_t) + des fonctions de filtrage sur les dynar */ +#include "instr/instr.h" + /* ****************************************************************************************** */ /* 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