X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12c0f182635ed71b370d608b5b9a614153765cd4..027295612d642dab025657808b3ab22304644aae:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index 0dc3be49f9..787df42f76 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2014. 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. */ @@ -12,6 +13,8 @@ #include "simgrid/simix.h" +#include "simgrid/platf.h" + SG_BEGIN_DECL() /** @brief Return code of most MSG functions @@ -78,15 +81,38 @@ 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 ***********************************/ -XBT_PUBLIC(size_t) MSG_file_read(void* ptr, size_t size, msg_file_t fd); -XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, msg_file_t fd); -XBT_PUBLIC(msg_file_t) MSG_file_open(const char* mount, const char* path); +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(size_t) MSG_file_get_size(msg_file_t fd); - -XBT_PUBLIC(int) MSG_file_unlink(msg_file_t fd); -XBT_PUBLIC(xbt_dict_t) MSG_file_ls(const char *mount, const char *path); - +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_size_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 storage); +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); +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(xbt_dynar_t) MSG_storages_as_dynar(void); +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); @@ -100,13 +126,19 @@ 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); -/* int MSG_get_msgload(void); This function lacks specification; discard it */ XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h); -XBT_PUBLIC(int) MSG_get_host_core(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_avail(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); +XBT_PUBLIC(double) MSG_get_host_power_peak_at(msg_host_t h, int pstate_index); +XBT_PUBLIC(double) MSG_get_host_current_power_peak(msg_host_t h); +XBT_PUBLIC(int) MSG_get_host_nb_pstates(msg_host_t h); +XBT_PUBLIC(void) MSG_set_host_power_peak_at(msg_host_t h, int pstate); +XBT_PUBLIC(double) MSG_get_host_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, @@ -121,10 +153,11 @@ 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, @@ -147,7 +180,6 @@ XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char properties); 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_get_data(msg_process_t process); @@ -176,7 +208,7 @@ XBT_PUBLIC(const char *) MSG_process_get_property_value(msg_process_t XBT_PUBLIC(msg_error_t) MSG_process_suspend(msg_process_t process); XBT_PUBLIC(msg_error_t) MSG_process_resume(msg_process_t process); XBT_PUBLIC(int) MSG_process_is_suspended(msg_process_t process); -XBT_PUBLIC(void) MSG_process_on_exit(int_f_pvoid_t fun, void *data); +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(msg_process_t) MSG_process_restart(msg_process_t process); @@ -215,7 +247,9 @@ 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(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); XBT_PUBLIC(double) MSG_task_get_compute_duration(msg_task_t task); @@ -404,7 +438,7 @@ XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t); // 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, long mem_cap, long net_cap, char *disk_path, long disk_size); + int core_nb, int mem_cap, int net_cap, char *disk_path, int disk_size, int mig_netspeed, int dp_intensity); XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); @@ -425,6 +459,7 @@ 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);