X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c85e43e7cc3034aefc758257a387d32026c05ef4..4fb3673da5b0ac154b2f70e40ccd11cf8993da32:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 72baeebf21..52e382b14b 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -9,6 +9,7 @@ #include "xbt.h" #include "xbt/lib.h" +#include "simgrid/forward.h" #include "simgrid/simix.h" #include "simgrid/platf.h" @@ -29,7 +30,7 @@ SG_BEGIN_DECL() typedef struct s_smx_rvpoint *msg_mailbox_t; /* ******************************** Environment ************************************ */ -typedef struct As *msg_as_t; +typedef surf_As *msg_as_t; /* ******************************** Host ************************************ */ @@ -52,6 +53,7 @@ typedef struct s_msg_host_priv { int is_migrating; xbt_dict_t affinity_mask_db; + xbt_dynar_t file_descriptor_table; #ifdef MSG_USE_DEPRECATED msg_mailbox_t *mailboxes; /**< the channels */ @@ -102,6 +104,7 @@ typedef struct msg_file_priv { 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; @@ -221,16 +224,10 @@ 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); @@ -270,7 +267,7 @@ 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); @@ -299,36 +296,32 @@ 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(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(double) MSG_host_get_wattmin_at(msg_host_t host, int pstate); -XBT_PUBLIC(double) MSG_host_get_wattmax_at(msg_host_t host, int pstate); - -XBT_PUBLIC(void) __MSG_host_destroy(msg_host_t 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); -XBT_PUBLIC(void) MSG_host_set_pstate(msg_host_t h, int pstate); -XBT_PUBLIC(int) MSG_host_get_pstate(msg_host_t host); +#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, ws_params_t params); -XBT_PUBLIC(void) MSG_host_set_params(msg_host_t ind_pm, ws_params_t params); +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); 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); -XBT_PUBLIC(double) MSG_host_get_consumed_energy(msg_host_t h); - /*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, @@ -667,17 +660,17 @@ 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: + // 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 de toutes les tasks + // 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) -+ des fonctions de filtrage sur les dynar ++ filtering functions on dynars */ #include "simgrid/instr.h"