X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f06041cf2c450457a0b47a49b66b19cb9133c18e..a3f2c3c47a2cdae9e34c468a0b548f085b92a188:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 4193fd27d1..eab901e400 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,32 +9,16 @@ #include "xbt.h" #include "xbt/lib.h" +#include "simgrid/forward.h" #include "simgrid/simix.h" -#include "simgrid/platf.h" SG_BEGIN_DECL() -/* ******************************** Mailbox ************************************ */ - -/** @brief Mailbox datatype - * @ingroup msg_task_usage - * - * Object representing a communication rendez-vous point, on which - * the sender finds the receiver it wants to communicate with. As a - * MSG user, you will only rarely manipulate any of these objects - * directly, since most of the public interface (such as - * #MSG_task_send and friends) hide this object behind a string - * alias. That mean that you don't provide the mailbox on which you - * want to send your task, but only the name of this mailbox. */ -typedef struct s_smx_rvpoint *msg_mailbox_t; - -/* ******************************** Environment ************************************ */ -typedef struct As *msg_as_t; +/* ************************* Autonomous System ****************************** */ +typedef simgrid_As *msg_as_t; /* ******************************** Host ************************************ */ -extern int MSG_HOST_LEVEL; - /** @brief Host datatype. @ingroup m_host_management @@ -45,28 +29,10 @@ extern int MSG_HOST_LEVEL; some private data that can be only accessed by local process. */ -typedef xbt_dictelm_t msg_host_t; -typedef s_xbt_dictelm_t s_msg_host_t; - -typedef struct msg_host_priv { - int dp_enabled; - xbt_dict_t dp_objs; - double dp_updated_by_deleted_tasks; - int is_migrating; - - xbt_dict_t affinity_mask_db; - -#ifdef MSG_USE_DEPRECATED - msg_mailbox_t *mailboxes; /**< the channels */ -#endif -} s_msg_host_priv_t, *msg_host_priv_t; - -static inline msg_host_priv_t MSG_host_priv(msg_host_t host){ - return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL); -} - +typedef sg_host_t msg_host_t; +XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors; /* ******************************** Task ************************************ */ typedef struct simdata_task *simdata_task_t; @@ -90,35 +56,30 @@ typedef struct msg_task *msg_task_t; /* ******************************** VM ************************************* */ typedef msg_host_t msg_vm_t; -typedef msg_host_priv_t msg_vm_priv_t; - -static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){ - return (msg_vm_priv_t) xbt_lib_get_level(vm, MSG_HOST_LEVEL); -} -/** ******************************** File ************************************ */ +/* ******************************** File ************************************ */ -/** @brief File datatype. -* @ingroup msg_file_management -* -* You should consider this as an opaque object. -*/ +/** @brief Opaque object describing a File in MSG. + * @ingroup msg_file */ typedef xbt_dictelm_t msg_file_t; -typedef s_xbt_dictelm_t s_msg_file_t; extern int MSG_FILE_LEVEL; typedef struct simdata_file *simdata_file_t; -typedef struct msg_file_priv { +struct msg_file_priv { char *fullpath; sg_size_t size; char* mount_point; char* storageId; char* storage_type; char* content_type; + int desc_id; void *data; simdata_file_t simdata; -} s_msg_file_priv_t, *msg_file_priv_t; +}; + +typedef struct msg_file_priv s_msg_file_priv_t; +typedef struct msg_file_priv* msg_file_priv_t; static inline msg_file_priv_t MSG_file_priv(msg_file_t file){ return (msg_file_priv_t )xbt_lib_get_level(file, MSG_FILE_LEVEL); @@ -135,37 +96,18 @@ extern int MSG_STORAGE_LEVEL; * You should consider this as an opaque object. */ typedef xbt_dictelm_t msg_storage_t; -typedef s_xbt_dictelm_t s_msg_storage_t; -typedef struct msg_storage_priv { +struct msg_storage_priv { const char *hostname; void *data; -} s_msg_storage_priv_t, *msg_storage_priv_t; +}; +typedef struct msg_storage_priv s_msg_storage_priv_t; +typedef struct msg_storage_priv* msg_storage_priv_t; static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){ return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL); } -/*************** Begin GPU ***************/ -typedef struct simdata_gpu_task *simdata_gpu_task_t; - -typedef struct msg_gpu_task { - char *name; /**< @brief task name if any */ - simdata_gpu_task_t simdata; /**< @brief simulator data */ - long long int counter; /* task unique identifier for instrumentation */ - char *category; /* task category for instrumentation */ -} s_msg_gpu_task_t; - -/** @brief GPU task datatype. - @ingroup m_task_management - - A task may then be defined by a computing - amount, a dispatch latency and a collect latency. - \see m_task_management -*/ -typedef struct msg_gpu_task *msg_gpu_task_t; -/*************** End GPU ***************/ - /** * \brief @brief Communication action. * \ingroup msg_task_usage @@ -191,20 +133,7 @@ typedef struct msg_comm *msg_comm_t; structure, but always use the provided API to interact with processes. */ -typedef struct s_smx_process *msg_process_t; - -#ifdef MSG_USE_DEPRECATED - -/* Compatibility typedefs */ -typedef int m_channel_t; -typedef msg_gpu_task_t m_gpu_task_t; -typedef msg_host_t m_host_t; -typedef msg_process_t m_process_t; -typedef msg_task_t m_task_t; -typedef s_msg_gpu_task_t s_m_gpu_task_t; -typedef s_msg_host_t s_m_host_t; -typedef s_msg_task_t s_m_task_t; -#endif +typedef smx_actor_t msg_process_t; /** @brief Return code of most MSG functions @ingroup msg_simulation @@ -235,39 +164,31 @@ XBT_PUBLIC(void) MSG_config(const char *key, const char *value); * * 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) do { \ + sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\ + MSG_init_nocheck(argc,argv); \ + } while (0) 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();; 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); -XBT_PUBLIC(xbt_main_func_t) MSG_get_registered_function(const char *name); XBT_PUBLIC(void) MSG_launch_application(const char *file); /*Bypass the parser */ XBT_PUBLIC(void) MSG_set_function(const char *host_id, const char *function_name, xbt_dynar_t arguments); -XBT_PUBLIC(double) MSG_get_clock(void); -XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); +XBT_PUBLIC(double) MSG_get_clock(); +XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(); /************************** Environment ***********************************/ -XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root(void); +XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root(); XBT_PUBLIC(const char *) MSG_environment_as_get_name(msg_as_t as); XBT_PUBLIC(msg_as_t) MSG_environment_as_get_by_name(const char * name); 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); -XBT_PUBLIC(const char *) MSG_environment_as_get_model(msg_as_t as); XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as); /************************** File handling ***********************************/ @@ -284,12 +205,11 @@ XBT_PUBLIC(msg_error_t) MSG_file_seek(msg_file_t fd, sg_offset_t offset, int ori XBT_PUBLIC(sg_size_t) MSG_file_tell (msg_file_t fd); XBT_PUBLIC(void) __MSG_file_get_info(msg_file_t fd); XBT_PUBLIC(void) __MSG_file_priv_free(msg_file_priv_t priv); -XBT_PUBLIC(const char *) MSG_file_get_name(msg_file_t storage); +XBT_PUBLIC(const char *) MSG_file_get_name(msg_file_t file); XBT_PUBLIC(msg_error_t) MSG_file_move(msg_file_t fd, const char* fullpath); XBT_PUBLIC(msg_error_t) MSG_file_rcopy(msg_file_t fd, msg_host_t host, const char* fullpath); XBT_PUBLIC(msg_error_t) MSG_file_rmove(msg_file_t fd, msg_host_t host, const char* fullpath); /************************** Storage handling ***********************************/ -XBT_PUBLIC(msg_host_t) MSG_get_storage_by_name(const char *name); XBT_PUBLIC(const char *) MSG_storage_get_name(msg_storage_t storage); XBT_PUBLIC(sg_size_t) MSG_storage_get_free_size(msg_storage_t storage); XBT_PUBLIC(sg_size_t) MSG_storage_get_used_size(msg_storage_t storage); @@ -297,7 +217,7 @@ XBT_PUBLIC(msg_storage_t) MSG_storage_get_by_name(const char *name); XBT_PUBLIC(xbt_dict_t) MSG_storage_get_properties(msg_storage_t storage); XBT_PUBLIC(void) MSG_storage_set_property_value(msg_storage_t storage, const char *name, char *value,void_f_pvoid_t free_ctn); XBT_PUBLIC(const char *)MSG_storage_get_property_value(msg_storage_t storage, const char *name); -XBT_PUBLIC(xbt_dynar_t) MSG_storages_as_dynar(void); +XBT_PUBLIC(xbt_dynar_t) MSG_storages_as_dynar(); XBT_PUBLIC(msg_error_t) MSG_storage_set_data(msg_storage_t host, void *data); XBT_PUBLIC(void *) MSG_storage_get_data(msg_storage_t storage); XBT_PUBLIC(xbt_dict_t) MSG_storage_get_content(msg_storage_t storage); @@ -310,26 +230,37 @@ 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_host_t) MSG_host_by_name(const char *name); +#define MSG_get_host_by_name(n) MSG_host_by_name(n) /* Rewrite the old name into the new one transparently */ 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); +/** \ingroup m_host_management + * + * \brief Return the name of the #msg_host_t. */ +#define MSG_host_get_name(host) sg_host_get_name(host) XBT_PUBLIC(void) MSG_host_on(msg_host_t host); XBT_PUBLIC(void) MSG_host_off(msg_host_t host); -XBT_PUBLIC(msg_host_t) MSG_host_self(void); -XBT_PUBLIC(int) MSG_get_host_msgload(msg_host_t host); -XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); +XBT_PUBLIC(msg_host_t) MSG_host_self(); +XBT_PUBLIC(double) MSG_host_get_speed(msg_host_t h); XBT_PUBLIC(int) MSG_host_get_core_number(msg_host_t h); XBT_PUBLIC(xbt_swag_t) MSG_host_get_process_list(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_on(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_off(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); + +// deprecated +XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); + XBT_PUBLIC(double) MSG_host_get_power_peak_at(msg_host_t h, int pstate); XBT_PUBLIC(double) MSG_host_get_current_power_peak(msg_host_t h); -XBT_PUBLIC(int) MSG_host_get_pstate_number(msg_host_t h); -XBT_PUBLIC(void) MSG_host_set_pstate(msg_host_t h, int pstate); -XBT_PUBLIC(double) MSG_host_get_consumed_energy(msg_host_t h); +XBT_PUBLIC(int) MSG_host_get_nb_pstates(msg_host_t h); +#define MSG_host_get_pstate(h) sg_host_get_pstate(h) +#define MSG_host_set_pstate(h, pstate) sg_host_set_pstate(h, pstate) +XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(); +XBT_PUBLIC(int) MSG_get_host_number(); +XBT_PUBLIC(xbt_dict_t) MSG_host_get_mounted_storage_list(msg_host_t host); +XBT_PUBLIC(xbt_dynar_t) MSG_host_get_attached_storage_list(msg_host_t host); +XBT_PUBLIC(xbt_dict_t) MSG_host_get_storage_content(msg_host_t host); /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(msg_host_t host); @@ -342,14 +273,6 @@ XBT_PUBLIC(void) MSG_host_set_property_value(msg_host_t host, XBT_PUBLIC(void) MSG_create_environment(const char *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); -XBT_PUBLIC(xbt_dict_t) MSG_host_get_mounted_storage_list(msg_host_t host); -XBT_PUBLIC(xbt_dynar_t) MSG_host_get_attached_storage_list(msg_host_t host); -XBT_PUBLIC(xbt_dict_t) MSG_host_get_storage_content(msg_host_t host); /************************** Process handling *********************************/ XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, xbt_main_func_t code, @@ -370,6 +293,11 @@ XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char char **argv, xbt_dict_t properties); +XBT_PUBLIC(msg_process_t) MSG_process_attach( + const char *name, void *data, + msg_host_t host, xbt_dict_t properties); +XBT_PUBLIC(void) MSG_process_detach(); + 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); @@ -383,11 +311,11 @@ 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(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(int) MSG_process_self_PID(); +XBT_PUBLIC(int) MSG_process_self_PPID(); +XBT_PUBLIC(msg_process_t) MSG_process_self(); +XBT_PUBLIC(xbt_dynar_t) MSG_processes_as_dynar(); +XBT_PUBLIC(int) MSG_process_get_number(); XBT_PUBLIC(msg_error_t) MSG_process_set_kill_time(msg_process_t process, double kill_time); @@ -409,10 +337,6 @@ XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process); XBT_PUBLIC(msg_task_t) MSG_task_create(const char *name, double flops_amount, double bytes_amount, void *data); -XBT_PUBLIC(msg_gpu_task_t) MSG_gpu_task_create(const char *name, - double flops_amount, - double dispatch_latency, - double collect_latency); XBT_PUBLIC(msg_task_t) MSG_parallel_task_create(const char *name, int host_nb, const msg_host_t * host_list, @@ -430,16 +354,11 @@ 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_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_parallel_task_execute_with_timeout(msg_task_t task, double timeout); 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(void) MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask); XBT_PUBLIC(msg_error_t) MSG_process_join(msg_process_t process, double timeout); XBT_PUBLIC(msg_error_t) MSG_process_sleep(double nb_sec); @@ -473,20 +392,14 @@ 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); +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_synchro_t), - void *match_data); +XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(msg_task_t task, const char *alias, + int (*match_fun)(void*,void*, smx_activity_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); @@ -496,105 +409,34 @@ 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(void) MSG_comm_waitall(msg_comm_t * comm, int nb_elem, - 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(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) - MSG_task_send_with_timeout(msg_task_t task, const char *alias, - double timeout); - -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) - MSG_task_send_bounded(msg_task_t task, const char *alias, double rate); - +XBT_PUBLIC(msg_error_t) MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout); +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) MSG_task_send_bounded(msg_task_t task, const char *alias, double rate); XBT_PUBLIC(int) MSG_task_listen_from(const char *alias); - 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) - MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t * task, - msg_host_t host, double timeout); - -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); +/************************** Mailbox handling ************************************/ +/* @brief MSG_mailbox_set_async - set a mailbox as eager + * Sets the mailbox to a permanent receiver mode. Messages sent to this mailbox will then be sent just after the send + * is issued, without waiting for the corresponding receive. + * This call should be done before issuing any receive, and on the receiver's side only + * @param alias The alias of the mailbox to modify. + */ XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias); - /************************** Action handling **********************************/ XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path); -XBT_PUBLIC(void) MSG_action_init(void); -XBT_PUBLIC(void) MSG_action_exit(void); - -#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(msg_host_t *) MSG_get_host_table(void); - -#define MSG_host_is_avail(h) MSG_host_is_on(h) - -#define MSG_TIMEOUT_FAILURE MSG_TIMEOUT -#define MSG_TASK_CANCELLED MSG_TASK_CANCELED -#define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \ - 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_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, - int channel, msg_host_t host); -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, - m_channel_t channel); -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, - msg_host_t dest, - m_channel_t channel, - double max_duration); -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(int) MSG_get_channel_number(void); -#endif +XBT_PUBLIC(void) MSG_action_init(); +XBT_PUBLIC(void) MSG_action_exit(); /** @brief Opaque type representing a semaphore * @ingroup msg_synchro @@ -605,7 +447,7 @@ XBT_PUBLIC(msg_sem_t) MSG_sem_init(int initial_value); XBT_PUBLIC(void) MSG_sem_acquire(msg_sem_t sem); XBT_PUBLIC(msg_error_t) MSG_sem_acquire_timeout(msg_sem_t sem, double timeout); XBT_PUBLIC(void) MSG_sem_release(msg_sem_t sem); -XBT_PUBLIC(void) MSG_sem_get_capacity(msg_sem_t sem); +XBT_PUBLIC(int) MSG_sem_get_capacity(msg_sem_t sem); XBT_PUBLIC(void) MSG_sem_destroy(msg_sem_t sem); XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem); @@ -615,7 +457,7 @@ XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem); */ #define MSG_BARRIER_SERIAL_PROCESS -1 -typedef struct s_xbt_bar *msg_bar_t; +typedef struct s_msg_bar* msg_bar_t; XBT_PUBLIC(msg_bar_t) MSG_barrier_init( unsigned int count); XBT_PUBLIC(void) MSG_barrier_destroy(msg_bar_t bar); XBT_PUBLIC(int) MSG_barrier_wait(msg_bar_t bar); @@ -629,17 +471,19 @@ XBT_PUBLIC(int) MSG_barrier_wait(msg_bar_t bar); * */ -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_created(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_migrating(msg_vm_t vm); -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(int) MSG_vm_is_suspended(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_saving(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_saved(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_restoring(msg_vm_t vm); +#define MSG_vm_get_name(vm) MSG_host_get_name(vm) -XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t); +XBT_PUBLIC(void) MSG_vm_get_params(msg_vm_t vm, vm_params_t params); +XBT_PUBLIC(void) MSG_vm_set_params(msg_vm_t vm, vm_params_t params); // TODO add VDI later XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name); @@ -648,7 +492,7 @@ XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t ind_pm, const char *name, XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_start(msg_vm_t); +XBT_PUBLIC(void) MSG_vm_start(msg_vm_t vm); /* Shutdown the guest operating system. */ XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm); @@ -665,37 +509,18 @@ XBT_PUBLIC(void) MSG_vm_restore(msg_vm_t vm); 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_set_affinity(msg_vm_t vm, msg_host_t pm, unsigned long mask); - -/* 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) -void MSG_process_set_property(msg_process_t, char* key, void* data) -void MSG_vm_set_property(msg_vm_t, char* key, void* data) - -void MSG_vm_setMemoryUsed(msg_vm_t vm, double size); -void MSG_vm_setCpuUsed(msg_vm_t vm, double inducedLoad); - // inducedLoad: un pourcentage (>100 si ca charge plus d'un coeur; - // <100 si c'est pas CPU intensive) - // Contraintes à poser: - // HOST_Power >= CpuUsedVm (\forall VM) + CpuUsedTask (\forall Task) - // VM_coreAmount >= Load de toutes les tasks -*/ - - /* -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 "simgrid/instr.h" +#include "simgrid/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); + +/* Functions renamed in 3.14 */ +#define MSG_mailbox_get_head(m) MSG_mailbox_front(m) + + SG_END_DECL() #endif