X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26f60d943e887977ea88e6ef97d7c1dd47acda1c..60059959d6d517261ca7f4176b0267bc37caf04d:/src/simix/smx_io_private.h diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h index 82f14f050d..f06e7835ca 100644 --- a/src/simix/smx_io_private.h +++ b/src/simix/smx_io_private.h @@ -8,7 +8,7 @@ #define _SIMIX_IO_PRIVATE_H #include "simgrid/simix.h" -#include "smx_smurf_private.h" +#include "popping_private.h" /** @brief Storage datatype */ typedef struct s_smx_storage_priv { @@ -26,28 +26,28 @@ void SIMIX_pre_file_read(smx_simcall_t simcall, smx_file_t fd, sg_size_t size, s void SIMIX_pre_file_write(smx_simcall_t simcall,smx_file_t fd, sg_size_t size, smx_host_t host); void SIMIX_pre_file_open(smx_simcall_t simcall, const char* fullpath, smx_host_t host); void SIMIX_pre_file_close(smx_simcall_t simcall, smx_file_t fd, smx_host_t host); -int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd); +int SIMIX_pre_file_unlink(smx_simcall_t simcall, smx_file_t fd, smx_host_t host); sg_size_t SIMIX_pre_file_get_size(smx_simcall_t simcall, smx_file_t fd); sg_size_t SIMIX_pre_file_tell(smx_simcall_t simcall, smx_file_t fd); xbt_dynar_t SIMIX_pre_file_get_info(smx_simcall_t simcall, smx_file_t fd); -int SIMIX_pre_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_size_t offset, int origin); +int SIMIX_pre_file_seek(smx_simcall_t simcall, smx_file_t fd, sg_offset_t offset, int origin); int SIMIX_pre_file_move(smx_simcall_t simcall, smx_file_t fd, const char* fullpath); smx_action_t SIMIX_file_read(smx_process_t process, smx_file_t fd, sg_size_t size, smx_host_t host); smx_action_t SIMIX_file_write(smx_process_t process, smx_file_t fd, sg_size_t size, smx_host_t host); smx_action_t SIMIX_file_open(smx_process_t process, const char* fullpath, smx_host_t host); smx_action_t SIMIX_file_close(smx_process_t process, smx_file_t fd, smx_host_t host); -int SIMIX_file_unlink(smx_process_t process, smx_file_t fd); +int SIMIX_file_unlink(smx_process_t process, smx_file_t fd, smx_host_t host); sg_size_t SIMIX_file_get_size(smx_process_t process, smx_file_t fd); sg_size_t SIMIX_file_tell(smx_process_t process, smx_file_t fd); xbt_dynar_t SIMIX_file_get_info(smx_process_t process, smx_file_t fd); -int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_size_t offset, int origin); +int SIMIX_file_seek(smx_process_t process, smx_file_t fd, sg_offset_t offset, int origin); int SIMIX_file_move(smx_process_t process, smx_file_t fd, const char* fullpath); -sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall,const char* name); -sg_size_t SIMIX_storage_get_free_size(smx_process_t process,const char* name); +sg_size_t SIMIX_pre_storage_get_free_size(smx_simcall_t simcall,smx_storage_t storage); +sg_size_t SIMIX_storage_get_free_size(smx_process_t process,smx_storage_t storage); -sg_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall,const char* name); -sg_size_t SIMIX_storage_get_used_size(smx_process_t process,const char* name); +sg_size_t SIMIX_pre_storage_get_used_size(smx_simcall_t simcall,smx_storage_t storage); +sg_size_t SIMIX_storage_get_used_size(smx_process_t process,smx_storage_t storage); xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage); xbt_dict_t SIMIX_pre_storage_get_properties(smx_simcall_t, smx_storage_t);