X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e22304ac763eda6122ced2baa724139e606b2ad..ac080087b39ef79ff497d3992ff04b3e20fe40b2:/include/simgrid/plugins/file_system.h diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h index 1a5ea1cd53..feb2a74b16 100644 --- a/include/simgrid/plugins/file_system.h +++ b/include/simgrid/plugins/file_system.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2019. 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. */ @@ -10,6 +10,14 @@ #include #include +#ifdef __cplusplus +#include + +#include +#include +#include +#endif + // C interface //////////////// typedef sg_file_t msg_file_t; // MSG backwards compatibility @@ -33,6 +41,11 @@ 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); +XBT_PUBLIC sg_size_t sg_disk_get_size_free(sg_disk_t d); +XBT_PUBLIC sg_size_t sg_disk_get_size_used(sg_disk_t d); +XBT_PUBLIC sg_size_t sg_disk_get_size(sg_disk_t d); +XBT_PUBLIC const char* sg_disk_get_mount_point(sg_disk_t d); + XBT_PUBLIC sg_size_t sg_storage_get_size_free(sg_storage_t st); XBT_PUBLIC sg_size_t sg_storage_get_size_used(sg_storage_t st); XBT_PUBLIC sg_size_t sg_storage_get_size(sg_storage_t st); @@ -40,21 +53,21 @@ XBT_PUBLIC xbt_dict_t sg_storage_get_content(sg_storage_t storage); XBT_PUBLIC xbt_dict_t sg_host_get_storage_content(sg_host_t host); -#define MSG_file_open(fullpath, data) sg_file_open(fullpath, data) -#define MSG_file_read(fd, size) sg_file_read(fd, size) -#define MSG_file_write(fd, size) sg_file_write(fd, size) +#define MSG_file_open(fullpath, data) sg_file_open((fullpath), (data)) +#define MSG_file_read(fd, size) sg_file_read((fd), (size)) +#define MSG_file_write(fd, size) sg_file_write((fd), (size)) #define MSG_file_close(fd) sg_file_close(fd) #define MSG_file_get_name(fd) sg_file_get_name(fd) #define MSG_file_get_size(fd) sg_file_get_size(fd) #define MSG_file_dump(fd) sg_file_dump(fd) #define MSG_file_get_data(fd) sg_file_get_data(fd) -#define MSG_file_set_data(fd, data) sg_file_set_data(fd, data) -#define MSG_file_seek(fd, offset, origin) sg_file_seek(fd, offset, origin) +#define MSG_file_set_data(fd, data) sg_file_set_data((fd), (data)) +#define MSG_file_seek(fd, offset, origin) sg_file_seek((fd), (offset), (origin)) #define MSG_file_tell(fd) sg_file_tell(fd) -#define MSG_file_move(fd, fullpath) sg_file_get_size(fd, fullpath) +#define MSG_file_move(fd, fullpath) sg_file_get_size((fd), (fullpath)) #define MSG_file_unlink(fd) sg_file_unlink(fd) -#define MSG_file_rcopy(file, host, fullpath) sg_file_rcopy(file, host, fullpath) -#define MSG_file_rmove(file, host, fullpath) sg_file_rmove(file, host, fullpath) +#define MSG_file_rcopy(file, host, fullpath) sg_file_rcopy((file), (host), (fullpath)) +#define MSG_file_rmove(file, host, fullpath) sg_file_rmove((file), (host), (fullpath)) #define MSG_storage_file_system_init() sg_storage_file_system_init() #define MSG_storage_get_free_size(st) sg_storage_get_size_free(st) @@ -70,10 +83,6 @@ SG_END_DECL() ////////////////// #ifdef __cplusplus -#include - -#include -#include namespace simgrid { namespace s4u { @@ -88,8 +97,10 @@ namespace s4u { */ class XBT_PUBLIC File { public: - File(std::string fullpath, void* userdata); - File(std::string fullpath, sg_host_t host, void* userdata); + File(const std::string& fullpath, void* userdata); + File(const std::string& fullpath, sg_host_t host, void* userdata); + File(const File&) = delete; + File& operator=(const File&) = delete; ~File(); /** Retrieves the path to the file */ @@ -99,7 +110,7 @@ public: sg_size_t read(sg_size_t size); /** Simulates a write action. Returns the size of data actually written. */ - sg_size_t write(sg_size_t size); + sg_size_t write(sg_size_t size, int write_inside=0); /** Allows to store user data on that host */ void set_userdata(void* data) { userdata_ = data; } @@ -112,7 +123,7 @@ public: sg_size_t tell(); /** Retrieves the current file position */ /** Rename a file. WARNING: It is forbidden to move the file to another mount point */ - void move(std::string fullpath); + 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); @@ -120,7 +131,8 @@ public: void dump(); int desc_id = 0; - Storage* local_storage_; + Disk* local_disk_ = nullptr; + Storage* local_storage_ = nullptr; std::string mount_point_; private: @@ -131,20 +143,48 @@ private: void* userdata_ = nullptr; }; +class XBT_PUBLIC FileSystemDiskExt { +public: + static simgrid::xbt::Extension EXTENSION_ID; + explicit FileSystemDiskExt(Disk* ptr); + FileSystemDiskExt(const FileSystemDiskExt&) = delete; + 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(s4u::Host* remote_host) { return remote_mount_points_[remote_host].c_str(); } + void add_remote_mount(Host* host, const std::string& mount_point) + { + remote_mount_points_.insert({host, mount_point}); + } + 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; } + +private: + 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; +}; + class XBT_PUBLIC FileSystemStorageExt { public: static simgrid::xbt::Extension EXTENSION_ID; explicit FileSystemStorageExt(Storage* ptr); - ~FileSystemStorageExt(); - std::map* parse_content(std::string filename); - std::map* get_content() { return content_; } + FileSystemStorageExt(const FileSystemStorageExt&) = delete; + 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::map* content_; + std::unique_ptr> content_; sg_size_t used_size_ = 0; sg_size_t size_ = 0; }; @@ -153,8 +193,9 @@ class XBT_PUBLIC FileDescriptorHostExt { public: static simgrid::xbt::Extension EXTENSION_ID; FileDescriptorHostExt() = default; - ~FileDescriptorHostExt() { delete file_descriptor_table; } - std::vector* file_descriptor_table = nullptr; // Created lazily on need + FileDescriptorHostExt(const FileDescriptorHostExt&) = delete; + FileDescriptorHostExt& operator=(const FileDescriptorHostExt&) = delete; + std::unique_ptr> file_descriptor_table = nullptr; // Created lazily on need }; } // namespace s4u } // namespace simgrid