X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c92907fc7a130fd6abc60b98791daa320742ba2..fcb0b0f21b4416e7cae17a50d9534bb46f81946c:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 66f8c3c7c5..ef9b314695 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -14,8 +14,9 @@ SG_BEGIN_DECL() -/* ************************* Autonomous System ****************************** */ -typedef simgrid_As *msg_as_t; +/* *************************** Network Zones ******************************** */ +#define msg_as_t msg_netzone_t /* portability macro */ +typedef simgrid_NetZone* msg_netzone_t; /* ******************************** Host ************************************ */ @@ -31,18 +32,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; @@ -72,7 +63,6 @@ typedef msg_host_t msg_vm_t; /** @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; @@ -88,6 +78,7 @@ struct msg_file_priv { 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; @@ -106,7 +97,6 @@ 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; struct msg_storage_priv { const char *hostname; @@ -144,7 +134,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 smx_actor_t msg_process_t; /** @brief Return code of most MSG functions @ingroup msg_simulation @@ -195,12 +185,13 @@ 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(); -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(msg_netzone_t) MSG_environment_get_routing_root(); +XBT_PUBLIC(const char*) MSG_environment_as_get_name(msg_netzone_t as); +XBT_PUBLIC(msg_netzone_t) MSG_environment_as_get_by_name(const char* name); +XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_netzone_t as); +XBT_PUBLIC(const char*) MSG_environment_as_get_property_value(msg_netzone_t as, const char* name); +XBT_PUBLIC(void) MSG_environment_as_set_property_value(msg_netzone_t netzone, const char* name, char* value); +XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_netzone_t as); /************************** File handling ***********************************/ XBT_PUBLIC(sg_size_t) MSG_file_read(msg_file_t fd, sg_size_t size); @@ -226,7 +217,7 @@ 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(); XBT_PUBLIC(msg_error_t) MSG_storage_set_data(msg_storage_t host, void *data); @@ -235,10 +226,6 @@ 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); @@ -269,8 +256,6 @@ XBT_PUBLIC(int) MSG_host_get_nb_pstates(msg_host_t 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(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); @@ -279,10 +264,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); @@ -290,22 +272,13 @@ 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_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); @@ -314,6 +287,7 @@ 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, @@ -369,9 +343,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); @@ -412,7 +386,7 @@ 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); + 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); @@ -470,7 +444,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); @@ -487,19 +461,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); +#define MSG_vm_get_name(vm) MSG_host_get_name(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(msg_host_t ind_pm, const char* name, int ramsize, int mig_netspeed, int dp_intensity); XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); @@ -514,39 +486,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* 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 */