X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b08c515d1ded5726d50e3e9e11c03260e3e1546d..c9e8dd1a590fecb704c4114633b881848c1ef7e9:/include/msg/msg.h?ds=sidebyside diff --git a/include/msg/msg.h b/include/msg/msg.h index a595340310..4a845f3601 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -13,6 +13,8 @@ #include "simgrid/simix.h" +#include "simgrid/platf.h" + SG_BEGIN_DECL() /** @brief Return code of most MSG functions @@ -79,24 +81,24 @@ 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(size_t size, msg_file_t fd); -XBT_PUBLIC(size_t) MSG_file_write(size_t size, msg_file_t fd); +XBT_PUBLIC(sg_storage_size_t) MSG_file_read(msg_file_t fd, sg_storage_size_t size); +XBT_PUBLIC(sg_storage_size_t) MSG_file_write(msg_file_t fd, sg_storage_size_t size); XBT_PUBLIC(msg_file_t) MSG_file_open(const char* mount, const char* path, 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(sg_storage_size_t) MSG_file_get_size(msg_file_t fd); XBT_PUBLIC(void) MSG_file_dump(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(msg_error_t) MSG_file_seek(msg_file_t fd, sg_storage_size_t offset, int whence); XBT_PUBLIC(void) __MSG_file_get_info(msg_file_t fd); - /************************** 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(size_t) MSG_storage_get_free_size(const char* name); -XBT_PUBLIC(size_t) MSG_storage_get_used_size(const char* name); +XBT_PUBLIC(sg_storage_size_t) MSG_storage_get_free_size(const char* name); +XBT_PUBLIC(sg_storage_size_t) MSG_storage_get_used_size(const char* name); 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); @@ -104,6 +106,9 @@ 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_storage_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(msg_error_t) MSG_storage_file_rename(msg_storage_t storage, const char* src, const char* dest); /************************** 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); @@ -143,7 +148,7 @@ 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(xbt_dict_t) MSG_host_get_storage_list(msg_host_t host); -XBT_PUBLIC(xbt_dynar_t) MSG_host_get_storage_content(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,