X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2eba6b843463b01622d79c8ccc55bdffffd0454c..87abed69d2734abfc0474c30b6f6d04b25a2c8ac:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 345b584d32..be2b3f057a 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,9 +6,9 @@ #ifndef MSG_H #define MSG_H -#include "simgrid/datatypes.h" #include "simgrid/forward.h" #include "simgrid/host.h" +#include "simgrid/plugins/live_migration.h" #include "xbt/base.h" #include "xbt/dict.h" @@ -17,6 +16,7 @@ #ifdef __cplusplus #include "simgrid/simix.h" +#include namespace simgrid { namespace msg { class Comm; @@ -51,7 +51,7 @@ typedef sg_host_t msg_host_t; XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors; /* ******************************** Task ************************************ */ -typedef struct simdata_task *simdata_task_t; +typedef struct s_simdata_task_t* simdata_task_t; typedef struct msg_task { char *name; /**< @brief task name if any */ @@ -169,73 +169,8 @@ XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char 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); -XBT_PUBLIC(sg_size_t) MSG_file_write(msg_file_t fd, sg_size_t size); -XBT_PUBLIC(msg_file_t) MSG_file_open(const char* fullpath, void* data); -XBT_PUBLIC(void*) MSG_file_get_data(msg_file_t fd); -XBT_PUBLIC(msg_error_t) MSG_file_set_data(msg_file_t fd, void * data); -XBT_PUBLIC(int) MSG_file_close(msg_file_t fd); -XBT_PUBLIC(sg_size_t) MSG_file_get_size(msg_file_t fd); -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(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(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); 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); @@ -243,56 +178,20 @@ XBT_PUBLIC(const char *)MSG_storage_get_property_value(msg_storage_t storage, co 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(const char *) MSG_storage_get_host(msg_storage_t storage); +XBT_PUBLIC(sg_size_t) MSG_storage_read(msg_storage_t storage, sg_size_t size); +XBT_PUBLIC(sg_size_t) MSG_storage_write(msg_storage_t storage, sg_size_t size); /************************** 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); -/** \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(); -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(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); -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) +XBT_ATTRIB_DEPRECATED_v320("Use MSG_host_get_speed(): v3.20 will drop MSG_host_get_current_power_peak() " + "completely.") static inline double 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(int) MSG_host_get_nb_pstates(msg_host_t h); -#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); - -/*property handlers*/ -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); XBT_PUBLIC(void) MSG_create_environment(const char *file); @@ -335,9 +234,7 @@ XBT_PUBLIC(msg_error_t) MSG_process_set_kill_time(msg_process_t process, double /*property handlers*/ 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(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); @@ -351,9 +248,7 @@ 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, - double flops_amount, - double bytes_amount, void *data); +XBT_PUBLIC(msg_task_t) MSG_task_create(const char* name, double flops_amount, double bytes_amount, void* data); XBT_PUBLIC(msg_task_t) MSG_parallel_task_create(const char *name, int host_nb, const msg_host_t * host_list, @@ -380,44 +275,37 @@ XBT_PUBLIC(void) MSG_task_set_bound(msg_task_t task, double bound); 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); -XBT_PUBLIC(void) MSG_task_set_flops_amount(msg_task_t task, - double flops_amount); +XBT_PUBLIC(void) MSG_task_set_flops_amount(msg_task_t task, double flops_amount); XBT_PUBLIC(double) MSG_task_get_flops_amount(msg_task_t task); -XBT_PUBLIC(void) MSG_task_set_bytes_amount(msg_task_t task, - double bytes_amount); +XBT_PUBLIC(double) MSG_task_get_remaining_work_ratio(msg_task_t task); +XBT_PUBLIC(void) MSG_task_set_bytes_amount(msg_task_t task, double bytes_amount); + 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_bytes_amount(msg_task_t task); +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) - MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, - msg_host_t host); +XBT_PUBLIC(msg_error_t) MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout); -XBT_PUBLIC(msg_error_t) - MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, - double timeout); - -XBT_PUBLIC(msg_error_t) - MSG_task_receive(msg_task_t * task, const char *alias); +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); +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_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*, void*), - void* match_data); +XBT_ATTRIB_DEPRECATED_v320( + "This function will be removed from SimGrid v3.20. If you really need this function, please speak up quickly.") + 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); @@ -460,7 +348,8 @@ XBT_PUBLIC(void) MSG_action_exit(); * @ingroup msg_synchro * @hideinitializer */ -typedef struct s_smx_sem *msg_sem_t; // Yeah that's a rename of the smx_sem_t which doesnt require smx_sem_t to be declared here +typedef struct s_smx_sem_t* msg_sem_t; // Yeah that's a rename of the smx_sem_t which doesnt require smx_sem_t to be + // declared here 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); @@ -475,7 +364,7 @@ XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem); */ #define MSG_BARRIER_SERIAL_PROCESS -1 -typedef struct s_msg_bar* msg_bar_t; +typedef struct s_msg_bar_t* 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); @@ -491,18 +380,22 @@ 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(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); +XBT_PUBLIC(void) MSG_vm_set_ramsize(msg_vm_t vm, size_t size); +XBT_PUBLIC(size_t) MSG_vm_get_ramsize(msg_vm_t vm); // 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_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_ATTRIB_DEPRECATED_v322("Use MSG_vm_create_migratable() from the live migration plugin: " + "v3.22 will drop MSG_vm_create() completely.") static msg_vm_t + MSG_vm_create(msg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity) +{ + return sg_vm_create_migratable(ind_pm, name, coreAmount, ramsize, mig_netspeed, dp_intensity); +} XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); @@ -511,8 +404,6 @@ 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); -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); XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); @@ -520,24 +411,18 @@ XBT_PUBLIC(void) MSG_vm_resume(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); - #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() #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); + std::map* properties); #endif #endif