X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387:/include/simgrid/plugins/file_system.h diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h index 6384260bb0..de471b4586 100644 --- a/include/simgrid/plugins/file_system.h +++ b/include/simgrid/plugins/file_system.h @@ -29,14 +29,14 @@ XBT_PUBLIC sg_size_t sg_file_read(sg_file_t fd, sg_size_t size); XBT_PUBLIC sg_size_t sg_file_write(sg_file_t fd, sg_size_t size); XBT_PUBLIC void sg_file_close(const_sg_file_t fd); -XBT_PUBLIC const char* sg_file_get_name(sg_file_t fd); -XBT_PUBLIC sg_size_t sg_file_get_size(sg_file_t fd); -XBT_PUBLIC void sg_file_dump(sg_file_t fd); +XBT_PUBLIC const char* sg_file_get_name(const_sg_file_t fd); +XBT_PUBLIC sg_size_t sg_file_get_size(const_sg_file_t fd); +XBT_PUBLIC void sg_file_dump(const_sg_file_t fd); XBT_PUBLIC void* sg_file_get_data(const_sg_file_t fd); XBT_PUBLIC void sg_file_set_data(sg_file_t fd, void* data); XBT_PUBLIC void sg_file_seek(sg_file_t fd, sg_offset_t offset, int origin); -XBT_PUBLIC sg_size_t sg_file_tell(sg_file_t fd); -XBT_PUBLIC void sg_file_move(sg_file_t fd, const char* fullpath); +XBT_PUBLIC sg_size_t sg_file_tell(const_sg_file_t fd); +XBT_PUBLIC void sg_file_move(const_sg_file_t fd, const char* fullpath); XBT_PUBLIC void sg_file_unlink(sg_file_t fd); XBT_PUBLIC int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath); XBT_PUBLIC int sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath); @@ -85,6 +85,9 @@ SG_END_DECL #ifdef __cplusplus namespace simgrid { + +extern template class XBT_PUBLIC xbt::Extendable; + namespace s4u { /** @brief A simulated file @@ -101,6 +104,10 @@ class XBT_PUBLIC File : public xbt::Extendable { std::string path_; std::string fullpath_; sg_size_t current_position_ = SEEK_SET; + int desc_id = 0; + Disk* local_disk_ = nullptr; + Storage* local_storage_ = nullptr; + std::string mount_point_; Storage* find_local_storage_on(Host* host); Disk* find_local_disk_on(const Host* host); @@ -115,7 +122,7 @@ public: ~File(); /** Retrieves the path to the file */ - const char* get_path() { return fullpath_.c_str(); } + const char* get_path() const { return fullpath_.c_str(); } /** Simulates a local read action. Returns the size of data actually read */ sg_size_t read(sg_size_t size); @@ -128,26 +135,27 @@ public: /** Retrieves the previously stored data */ XBT_ATTRIB_DEPRECATED_v329("Please use get_data()") void* get_userdata() { return get_data(); } - sg_size_t size(); + sg_size_t size() const; void seek(sg_offset_t pos); /** Sets the file head to the given position. */ void seek(sg_offset_t pos, int origin); /** Sets the file head to the given position from a given origin. */ - sg_size_t tell(); /** Retrieves the current file position */ + sg_size_t tell() const; /** Retrieves the current file position */ /** Rename a file. WARNING: It is forbidden to move the file to another mount point */ - void move(const std::string& fullpath); - int remote_copy(sg_host_t host, const char* fullpath); - int remote_move(sg_host_t host, const char* fullpath); + void move(const std::string& fullpath) const; + int remote_copy(sg_host_t host, const std::string& fullpath); + int remote_move(sg_host_t host, const std::string& fullpath); - int unlink(); /** Remove a file from the contents of a disk */ - void dump(); - - int desc_id = 0; - Disk* local_disk_ = nullptr; - Storage* local_storage_ = nullptr; - std::string mount_point_; + int unlink() const; /** Remove a file from the contents of a disk */ + void dump() const; }; class XBT_PUBLIC FileSystemDiskExt { + std::unique_ptr> content_; + std::map remote_mount_points_; + std::string mount_point_; + sg_size_t used_size_ = 0; + sg_size_t size_ = static_cast(500 * 1024) * 1024 * 1024; + public: static simgrid::xbt::Extension EXTENSION_ID; explicit FileSystemDiskExt(const Disk* ptr); @@ -155,7 +163,7 @@ public: FileSystemDiskExt& operator=(const FileSystemDiskExt&) = delete; std::map* parse_content(const std::string& filename); std::map* get_content() const { return content_.get(); } - const char* get_mount_point() { return mount_point_.c_str(); } + const char* get_mount_point() const { return mount_point_.c_str(); } const char* get_mount_point(s4u::Host* remote_host) { return remote_mount_points_[remote_host].c_str(); } void add_remote_mount(Host* host, const std::string& mount_point) { @@ -163,18 +171,15 @@ public: } sg_size_t get_size() const { return size_; } sg_size_t get_used_size() const { return used_size_; } - void decr_used_size(sg_size_t size) { used_size_ -= size; } - void incr_used_size(sg_size_t size) { used_size_ += size; } + void decr_used_size(sg_size_t size); + void incr_used_size(sg_size_t size); +}; -private: +class XBT_PUBLIC FileSystemStorageExt { std::unique_ptr> content_; - std::map remote_mount_points_; - std::string mount_point_; sg_size_t used_size_ = 0; - sg_size_t size_ = static_cast(500 * 1024) * 1024 * 1024; -}; + sg_size_t size_ = 0; -class XBT_PUBLIC FileSystemStorageExt { public: static simgrid::xbt::Extension EXTENSION_ID; explicit FileSystemStorageExt(const Storage* ptr); @@ -182,15 +187,10 @@ public: FileSystemStorageExt& operator=(const FileSystemStorageExt&) = delete; std::map* parse_content(const std::string& filename); std::map* get_content() { return content_.get(); } - sg_size_t get_size() { return size_; } - sg_size_t get_used_size() { return used_size_; } - void decr_used_size(sg_size_t size) { used_size_ -= size; } - void incr_used_size(sg_size_t size) { used_size_ += size; } - -private: - std::unique_ptr> content_; - sg_size_t used_size_ = 0; - sg_size_t size_ = 0; + sg_size_t get_size() const { return size_; } + sg_size_t get_used_size() const { return used_size_; } + void decr_used_size(sg_size_t size); + void incr_used_size(sg_size_t size); }; class XBT_PUBLIC FileDescriptorHostExt {