X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8cd1ef6275c48c8985e297ba1e484cbb85ba6126..7d28d93b90eedd2a49da8b9b990296669e46d05c:/src/plugins/file_system/s4u_FileSystem.cpp?ds=sidebyside diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index 1b40450457..25c6cafd96 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files"); @@ -105,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."); @@ -388,7 +389,7 @@ int File::unlink() const } } -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; @@ -431,7 +432,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; } } @@ -450,7 +451,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; } } @@ -462,19 +463,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(); @@ -509,7 +509,7 @@ std::map* FileSystemDiskExt::parse_content(const std::st if (filename.empty()) return nullptr; - std::map* parse_content = new std::map(); + auto* parse_content = new std::map(); std::ifstream* fs = surf_ifsopen(filename); xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(), @@ -538,7 +538,7 @@ std::map* FileSystemStorageExt::parse_content(const std: if (filename.empty()) return nullptr; - std::map* parse_content = new std::map(); + auto* parse_content = new std::map(); std::ifstream* fs = surf_ifsopen(filename); xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(), @@ -613,7 +613,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; @@ -702,7 +702,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(); @@ -711,12 +711,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(); } @@ -752,12 +752,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); } @@ -839,8 +839,7 @@ xbt_dict_t sg_storage_get_content(const_sg_storage_t storage) 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;