X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f21d73ef32ea86aef784a1b9a0d12c1151fd9aa..f409d6f711ba652a6fd78e185791cf7870b6765d:/src/plugins/file_system/s4u_FileSystem.cpp diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index 588ea8e60d..46c0016f9b 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -9,12 +9,14 @@ #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf_private.hpp" #include "xbt/config.hpp" +#include "xbt/parse_units.hpp" #include #include #include #include #include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files"); @@ -93,7 +95,7 @@ File::File(const std::string& fullpath, void* userdata) : File(fullpath, Host::c File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath) { - kernel::actor::simcall([this, &fullpath, host, userdata] { + kernel::actor::simcall([this, &host, userdata] { this->set_data(userdata); // this cannot fail because we get a xbt_die if the mountpoint does not exist if (not host->get_mounted_storages().empty()) { @@ -104,9 +106,9 @@ File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpa } // assign a file descriptor id to the newly opened File - FileDescriptorHostExt* ext = host->extension(); + auto* ext = host->extension(); if (ext->file_descriptor_table == nullptr) { - ext->file_descriptor_table.reset(new std::vector(sg_storage_max_file_descriptors)); + ext->file_descriptor_table = std::make_unique>(sg_storage_max_file_descriptors); std::iota(ext->file_descriptor_table->rbegin(), ext->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0. } xbt_assert(not ext->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed."); @@ -114,7 +116,7 @@ File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpa ext->file_descriptor_table->pop_back(); XBT_DEBUG("\tOpen file '%s'", path_.c_str()); - std::map* content = nullptr; + std::map>* content = nullptr; if (local_storage_) content = local_storage_->extension()->get_content(); @@ -142,7 +144,7 @@ File::~File() kernel::actor::simcall([this, desc_table] { desc_table->push_back(this->desc_id); }); } -void File::dump() +void File::dump() const { if (local_storage_) XBT_INFO("File Descriptor information:\n" @@ -234,7 +236,7 @@ sg_size_t File::write_on_disk(sg_size_t size, bool write_inside) size_ = current_position_; } kernel::actor::simcall([this] { - std::map* content = local_disk_->extension()->get_content(); + std::map>* content = local_disk_->extension()->get_content(); content->erase(path_); content->insert({path_, size_}); @@ -274,7 +276,8 @@ sg_size_t File::write_on_storage(sg_size_t size, bool write_inside) size_ = current_position_; } kernel::actor::simcall([this] { - std::map* content = local_storage_->extension()->get_content(); + std::map>* content = + local_storage_->extension()->get_content(); content->erase(path_); content->insert({path_, size_}); @@ -296,7 +299,7 @@ sg_size_t File::write(sg_size_t size, bool write_inside) return 0; } -sg_size_t File::size() +sg_size_t File::size() const { return size_; } @@ -323,16 +326,16 @@ void File::seek(sg_offset_t offset, int origin) } } -sg_size_t File::tell() +sg_size_t File::tell() const { return current_position_; } -void File::move(const std::string& fullpath) +void File::move(const std::string& fullpath) const { /* Check if the new full path is on the same mount point */ if (fullpath.compare(0, mount_point_.length(), mount_point_) == 0) { - std::map* content = nullptr; + std::map>* content = nullptr; if (local_storage_) content = local_storage_->extension()->get_content(); if (local_disk_) @@ -354,10 +357,10 @@ void File::move(const std::string& fullpath) } } -int File::unlink() +int File::unlink() const { /* Check if the file is on local storage */ - std::map* content = nullptr; + std::map>* content = nullptr; const char* name = ""; if (local_storage_) { content = local_storage_->extension()->get_content(); @@ -387,7 +390,7 @@ int File::unlink() } } -int File::remote_copy(sg_host_t host, const char* fullpath) +int File::remote_copy(sg_host_t host, const std::string& fullpath) { /* Find the host where the file is physically located and read it */ Host* src_host = nullptr; @@ -430,7 +433,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) /* Mount point found, retrieve the host the storage is attached to */ dst_host = storage_dest->get_host(); } else { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname()); + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); return -1; } } @@ -449,7 +452,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) } if (dst_disk == nullptr) { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname()); + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); return -1; } } @@ -461,19 +464,18 @@ int File::remote_copy(sg_host_t host, const char* fullpath) } /* Create file on remote host, write it and close it */ - File* fd = new File(fullpath, dst_host, nullptr); + File fd(fullpath, dst_host, nullptr); if (local_storage_) { - sg_size_t write_size = fd->local_storage_->write(read_size); - fd->local_storage_->extension()->incr_used_size(write_size); - (*(fd->local_storage_->extension()->get_content()))[path_] = size_; + sg_size_t write_size = fd.local_storage_->write(read_size); + fd.local_storage_->extension()->incr_used_size(write_size); + (*(fd.local_storage_->extension()->get_content()))[path_] = size_; } if (local_disk_) - fd->write(read_size); - delete fd; + fd.write(read_size); return 0; } -int File::remote_move(sg_host_t host, const char* fullpath) +int File::remote_move(sg_host_t host, const std::string& fullpath) { int res = remote_copy(host, fullpath); unlink(); @@ -483,8 +485,9 @@ int File::remote_move(sg_host_t host, const char* fullpath) FileSystemDiskExt::FileSystemDiskExt(const Disk* ptr) { const char* size_str = ptr->get_property("size"); + std::string dummyfile; if (size_str) - size_ = surf_parse_get_size(size_str, "disk size", ptr->get_name()); + size_ = surf_parse_get_size(dummyfile, -1, size_str, "disk size", ptr->get_name()); const char* current_mount_str = ptr->get_property("mount"); if (current_mount_str) @@ -502,14 +505,14 @@ FileSystemStorageExt::FileSystemStorageExt(const Storage* ptr) : size_(ptr->get_ content_.reset(parse_content(ptr->get_impl()->content_name_)); } -std::map* FileSystemDiskExt::parse_content(const std::string& filename) +std::map>* FileSystemDiskExt::parse_content(const std::string& filename) { if (filename.empty()) return nullptr; - std::map* parse_content = new std::map(); + auto* parse_content = new std::map>(); - std::ifstream* fs = surf_ifsopen(filename); + auto fs = std::unique_ptr(surf_ifsopen(filename)); xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(), (boost::join(surf_path, ":")).c_str()); @@ -527,18 +530,17 @@ std::map* FileSystemDiskExt::parse_content(const std::st parse_content->insert({tokens.front(), size}); } } while (not fs->eof()); - delete fs; return parse_content; } -std::map* FileSystemStorageExt::parse_content(const std::string& filename) +std::map>* FileSystemStorageExt::parse_content(const std::string& filename) { if (filename.empty()) return nullptr; - std::map* parse_content = new std::map(); + auto* parse_content = new std::map>(); - std::ifstream* fs = surf_ifsopen(filename); + auto fs = std::unique_ptr(surf_ifsopen(filename)); xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(), (boost::join(surf_path, ":")).c_str()); @@ -556,7 +558,6 @@ std::map* FileSystemStorageExt::parse_content(const std: parse_content->insert({tokens.front(), size}); } } while (not fs->eof()); - delete fs; return parse_content; } @@ -611,7 +612,7 @@ static void on_platform_created() simgrid::s4u::Host* remote_host = simgrid::s4u::Host::by_name_or_null(tokens[2]); xbt_assert(remote_host, "You're trying to access a host that does not exist. Please check your platform file"); - simgrid::s4u::Disk* disk = nullptr; + const simgrid::s4u::Disk* disk = nullptr; for (auto const& d : remote_host->get_disks()) if (d->get_name() == tokens[1]) { disk = d; @@ -700,7 +701,7 @@ void sg_file_close(const_sg_file_t fd) /** Retrieves the path to the file * @ingroup plugin_filesystem */ -const char* sg_file_get_name(sg_file_t fd) +const char* sg_file_get_name(const_sg_file_t fd) { xbt_assert((fd != nullptr), "Invalid file descriptor"); return fd->get_path(); @@ -709,12 +710,12 @@ const char* sg_file_get_name(sg_file_t fd) /** Retrieves the size of the file * @ingroup plugin_filesystem */ -sg_size_t sg_file_get_size(sg_file_t fd) +sg_size_t sg_file_get_size(const_sg_file_t fd) { return fd->size(); } -void sg_file_dump(sg_file_t fd) +void sg_file_dump(const_sg_file_t fd) { fd->dump(); } @@ -750,12 +751,12 @@ void sg_file_seek(sg_file_t fd, sg_offset_t offset, int origin) fd->seek(offset, origin); } -sg_size_t sg_file_tell(sg_file_t fd) +sg_size_t sg_file_tell(const_sg_file_t fd) { return fd->tell(); } -void sg_file_move(sg_file_t fd, const char* fullpath) +void sg_file_move(const_sg_file_t fd, const char* fullpath) { fd->move(fullpath); } @@ -831,14 +832,13 @@ sg_size_t sg_storage_get_size(const_sg_storage_t st) xbt_dict_t sg_storage_get_content(const_sg_storage_t storage) { - const std::map* content = + const std::map>* content = storage->extension()->get_content(); // Note: ::operator delete is ok here (no destructor called) since the dict elements are of POD type sg_size_t. xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete); for (auto const& entry : *content) { - sg_size_t* psize = new sg_size_t; - *psize = entry.second; + auto* psize = new sg_size_t(entry.second); xbt_dict_set(content_as_dict, entry.first.c_str(), psize); } return content_as_dict;