X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64ea8dcf1daac53da58d65aa91b7452aae8b13b7..2eba6b843463b01622d79c8ccc55bdffffd0454c:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 27594822dd..345b584d32 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -7,29 +7,31 @@ #ifndef MSG_H #define MSG_H -#include "xbt.h" -#include "xbt/lib.h" +#include "simgrid/datatypes.h" #include "simgrid/forward.h" +#include "simgrid/host.h" + +#include "xbt/base.h" +#include "xbt/dict.h" +#include "xbt/dynar.h" + +#ifdef __cplusplus #include "simgrid/simix.h" +namespace simgrid { +namespace msg { +class Comm; +} +} +typedef simgrid::msg::Comm sg_msg_Comm; +#else +typedef struct msg_Comm sg_msg_Comm; +#endif 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_mailbox *msg_mailbox_t; - -/* ******************************** Environment ************************************ */ -typedef simgrid_As *msg_as_t; +/* *************************** Network Zones ******************************** */ +#define msg_as_t msg_netzone_t /* portability macro */ +typedef s4u_NetZone* msg_netzone_t; /* ******************************** Host ************************************ */ @@ -45,16 +47,8 @@ typedef simgrid_As *msg_as_t; */ typedef sg_host_t msg_host_t; -typedef struct s_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; - xbt_dynar_t file_descriptor_table; -} s_msg_host_priv_t; +XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors; /* ******************************** Task ************************************ */ typedef struct simdata_task *simdata_task_t; @@ -77,59 +71,19 @@ typedef struct msg_task { typedef struct msg_task *msg_task_t; /* ******************************** VM ************************************* */ -typedef msg_host_t msg_vm_t; +typedef sg_vm_t msg_vm_t; /* ******************************** File ************************************ */ - -/** @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; - -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; -}; -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); -} +typedef sg_file_t msg_file_t; /* ******************************** Storage ************************************ */ -/* TODO: PV: to comment */ - -extern int MSG_STORAGE_LEVEL; /** @brief Storage datatype. * @ingroup msg_storage_management * * You should consider this as an opaque object. */ -typedef xbt_dictelm_t msg_storage_t; -typedef s_xbt_dictelm_t s_msg_storage_t; - -struct msg_storage_priv { - const char *hostname; - void *data; -}; -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); -} +typedef sg_storage_t msg_storage_t; /** * \brief @brief Communication action. @@ -137,7 +91,7 @@ static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){ * * Object representing an ongoing communication between processes. Such beast is usually obtained by using #MSG_task_isend, #MSG_task_irecv or friends. */ -typedef struct msg_comm *msg_comm_t; +typedef sg_msg_Comm* msg_comm_t; /** \brief Default value for an uninitialized #msg_task_t. \ingroup m_task_management @@ -156,7 +110,7 @@ typedef struct msg_comm *msg_comm_t; structure, but always use the provided API to interact with processes. */ -typedef smx_process_t msg_process_t; +typedef s4u_Actor* msg_process_t; /** @brief Return code of most MSG functions @ingroup msg_simulation @@ -193,27 +147,74 @@ XBT_PUBLIC(void) MSG_config(const char *key, const char *value); } 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); - -/************************** 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(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(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as); +XBT_PUBLIC(double) MSG_get_clock(); +XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(); + +/************************** Net Zones ***********************************/ +XBT_PUBLIC(msg_netzone_t) MSG_zone_get_root(); +XBT_PUBLIC(const char*) MSG_zone_get_name(msg_netzone_t zone); +XBT_PUBLIC(msg_netzone_t) MSG_zone_get_by_name(const char* name); +XBT_PUBLIC(void) MSG_zone_get_sons(msg_netzone_t zone, xbt_dict_t whereto); +XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char* name); +XBT_PUBLIC(void) MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value); +XBT_PUBLIC(void) MSG_zone_get_hosts(msg_netzone_t zone, xbt_dynar_t whereto); + +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_get_root() instead: v3.19 will remove MSG_environment_get_routing_root() completely.") msg_netzone_t + MSG_environment_get_routing_root() +{ + return MSG_zone_get_root(); +} +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_get_name() instead: v3.19 will remove MSG_environment_as_get_name() completely.") const + char* MSG_environment_as_get_name(msg_netzone_t zone) +{ + return MSG_zone_get_name(zone); +} +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_get_by_name() instead: v3.19 will remove MSG_environment_as_get_by_name() completely.") msg_netzone_t + MSG_environment_as_get_by_name(const char* name) +{ + return MSG_zone_get_by_name(name); +} +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_get_sons() instead: v3.19 will remove MSG_environment_as_get_routing_sons() completely.") xbt_dict_t + MSG_environment_as_get_routing_sons(msg_netzone_t zone) +{ + xbt_dict_t res = xbt_dict_new_homogeneous(NULL); + MSG_zone_get_sons(zone, res); + return res; +} +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_get_property_value() instead: v3.19 will remove MSG_environment_as_get_property_value() completely.") + const char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name) +{ + return MSG_zone_get_property_value(zone, name); +} +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_set_property_value() instead: v3.19 will remove MSG_environment_as_set_property_value() " + "completely.") void MSG_environment_as_set_property_value(msg_netzone_t zone, const char* name, char* value) +{ + MSG_zone_set_property_value(zone, name, value); +} +static inline XBT_ATTRIB_DEPRECATED_v319( + "Use MSG_zone_get_hosts() instead: v3.19 will remove MSG_environment_as_get_hosts() completely.") xbt_dynar_t + MSG_environment_as_get_hosts(msg_netzone_t zone) +{ + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL); + MSG_zone_get_hosts(zone, res); + return res; +} /************************** File handling ***********************************/ XBT_PUBLIC(sg_size_t) MSG_file_read(msg_file_t fd, sg_size_t size); @@ -227,8 +228,6 @@ XBT_PUBLIC(void) MSG_file_dump(msg_file_t fd); XBT_PUBLIC(msg_error_t) MSG_file_unlink(msg_file_t fd); XBT_PUBLIC(msg_error_t) MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin); 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 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); @@ -239,19 +238,14 @@ 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); 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(void) MSG_storage_set_property_value(msg_storage_t storage, const char* name, char* value); 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); XBT_PUBLIC(sg_size_t) MSG_storage_get_size(msg_storage_t storage); -XBT_PUBLIC(msg_error_t) MSG_storage_file_move(msg_file_t fd, msg_host_t dest, char* mount, char* fullname); XBT_PUBLIC(const char *) MSG_storage_get_host(msg_storage_t storage); -/************************** 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_host_t) MSG_host_by_name(const char *name); @@ -264,26 +258,32 @@ XBT_PUBLIC(void *) MSG_host_get_data(msg_host_t host); #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(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(void) MSG_host_get_process_list(msg_host_t h, xbt_dynar_t whereto); XBT_PUBLIC(int) MSG_host_is_on(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_off(msg_host_t h); -// deprecated -XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); - +static inline double + XBT_ATTRIB_DEPRECATED_v319("Use MSG_host_get_speed(): v3.19 will drop MSG_get_host_speed() completely.") + MSG_get_host_speed(msg_host_t host) +{ + return MSG_host_get_speed(host); +} +static inline double XBT_ATTRIB_DEPRECATED_v320( + "Use MSG_host_get_speed(): v3.20 will drop MSG_host_get_current_power_peak() completely.") + MSG_host_get_current_power_peak(msg_host_t host) +{ + return MSG_host_get_speed(host); +} 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_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(void); -XBT_PUBLIC(int) MSG_get_host_number(void); -XBT_PUBLIC(void) MSG_host_get_params(msg_host_t ind_pm, vm_params_t params); -XBT_PUBLIC(void) MSG_host_set_params(msg_host_t ind_pm, vm_params_t params); +#define MSG_host_get_pstate(h) sg_host_get_pstate(h) /* users don't know that MSG is the C version of SimGrid */ +#define MSG_host_set_pstate(h, pstate) sg_host_set_pstate(h, pstate) /* (same here) */ +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); @@ -292,10 +292,7 @@ XBT_PUBLIC(xbt_dict_t) MSG_host_get_storage_content(msg_host_t host); XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(msg_host_t host); XBT_PUBLIC(const char *) MSG_host_get_property_value(msg_host_t host, const char *name); -XBT_PUBLIC(void) MSG_host_set_property_value(msg_host_t host, - const char *name, char *value, - void_f_pvoid_t free_ctn); - +XBT_PUBLIC(void) MSG_host_set_property_value(msg_host_t host, const char* name, char* value); XBT_PUBLIC(void) MSG_create_environment(const char *file); @@ -303,30 +300,20 @@ XBT_PUBLIC(void) MSG_create_environment(const char *file); XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, xbt_main_func_t code, void *data, msg_host_t host); -XBT_PUBLIC(msg_process_t) MSG_process_create_with_arguments(const char *name, - xbt_main_func_t - code, void *data, - msg_host_t host, - int argc, - char **argv); -XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char - *name, - xbt_main_func_t - code, - void *data, - msg_host_t host, - int argc, - 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(void); +XBT_PUBLIC(msg_process_t) +MSG_process_create_with_arguments(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc, + char** argv); +XBT_PUBLIC(msg_process_t) +MSG_process_create_with_environment(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc, + 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); +XBT_PUBLIC(void) MSG_process_yield(); XBT_PUBLIC(void *) MSG_process_get_data(msg_process_t process); XBT_PUBLIC(msg_error_t) MSG_process_set_data(msg_process_t process, @@ -337,11 +324,12 @@ 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(const char*) MSG_process_self_name(); +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); @@ -357,7 +345,10 @@ XBT_PUBLIC(int) MSG_process_is_suspended(msg_process_t process); XBT_PUBLIC(void) MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data); XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart); +XBT_PUBLIC(void) MSG_process_daemonize(msg_process_t process); XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process); +XBT_PUBLIC(void) MSG_process_ref(msg_process_t process); +XBT_PUBLIC(void) MSG_process_unref(msg_process_t process); /************************** Task handling ************************************/ XBT_PUBLIC(msg_task_t) MSG_task_create(const char *name, @@ -382,9 +373,9 @@ XBT_PUBLIC(msg_error_t) MSG_task_destroy(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(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); @@ -424,8 +415,9 @@ XBT_PUBLIC(msg_error_t) MSG_task_receive_bounded(msg_task_t * task, const char * 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*, void*), + 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); @@ -450,27 +442,6 @@ 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); /************************** Mailbox handling ************************************/ -/* @brief MSG_mailbox_new - create a new mailbox. - * Creates a new mailbox identified by the key specified by the parameter alias and add it in the global dictionary. - * @param alias The alias of the mailbox to create. - * @return The newly created mailbox. - */ -XBT_PUBLIC(msg_mailbox_t) MSG_mailbox_new(const char *alias); - -/* @brief MSG_mailbox_get_by_alias - get a mailbox from its alias. - * Returns the mailbox associated with the key specified by the parameter alias. If the mailbox does not exists, - * the function creates it. - * @param alias The alias of the mailbox to return. - * @return The mailbox associated with the alias specified as parameter or a new one if the key doesn't match. - */ -XBT_PUBLIC(msg_mailbox_t) MSG_mailbox_get_by_alias(const char *alias); - -/* @brief MSG_mailbox_is_empty - test if a mailbox is empty. - * Tests if a mailbox is empty (contains no msg task). - * @param mailbox The mailbox to get test. - * @return 1 if the mailbox is empty, 0 otherwise. - */ -XBT_PUBLIC(int) MSG_mailbox_is_empty(msg_mailbox_t mailbox); /* @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 @@ -480,22 +451,10 @@ XBT_PUBLIC(int) MSG_mailbox_is_empty(msg_mailbox_t mailbox); */ XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias); -/* @brief MSG_mailbox_get_head - get the task at the head of a mailbox. - * Returns the task at the head of the mailbox. This function does not remove the task from the mailbox. - * @param mailbox The mailbox concerned by the operation. - * @return The task at the head of the mailbox. - */ -XBT_PUBLIC(msg_task_t) MSG_mailbox_front(msg_mailbox_t mailbox); - -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); - /************************** 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); +XBT_PUBLIC(void) MSG_action_init(); +XBT_PUBLIC(void) MSG_action_exit(); /** @brief Opaque type representing a semaphore * @ingroup msg_synchro @@ -506,7 +465,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); @@ -516,7 +475,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); @@ -533,19 +492,17 @@ XBT_PUBLIC(int) MSG_barrier_wait(msg_bar_t bar); 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 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); - XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t vm); +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); -XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t ind_pm, const char *name, - int core_nb, int mem_cap, int net_cap, char *disk_path, int disk_size, int mig_netspeed, int dp_intensity); +XBT_PUBLIC(msg_vm_t) MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount); +XBT_PUBLIC(msg_vm_t) +MSG_vm_create(msg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity); XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); @@ -560,39 +517,11 @@ XBT_PUBLIC(void) MSG_vm_migrate(msg_vm_t vm, msg_host_t destination); XBT_PUBLIC(void) MSG_vm_suspend(msg_vm_t vm); XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); -/* 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(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: a percentage (>100 if it loads more than one core; - // <100 if it's not CPU intensive) - // Required contraints: - // HOST_Power >= CpuUsedVm (\forall VM) + CpuUsedTask (\forall Task) - // VM_coreAmount >= Load of all 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) -+ filtering functions on dynars -*/ -#include "simgrid/instr.h" +#include "simgrid/instr.h" /* ****************************************************************************************** */ /* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */ @@ -604,4 +533,11 @@ XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(msg_process_t process); SG_END_DECL() + +#ifdef __cplusplus +XBT_PUBLIC(msg_process_t) +MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, + xbt_dict_t properties); +#endif + #endif