X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04a207ea8a9ddfba41b4d3806451b051eb1ba05c..730305cbe236b9f3d5781ec05d20e730ac6452ff:/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 677b4c5353..929cf17441 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2023. 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. */ @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -22,7 +23,6 @@ #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files"); -int sg_storage_max_file_descriptors = 1024; /** @defgroup plugin_filesystem Plugin FileSystem * @@ -37,6 +37,7 @@ template class xbt::Extendable; namespace s4u { simgrid::xbt::Extension FileSystemDiskExt::EXTENSION_ID; simgrid::xbt::Extension FileDescriptorHostExt::EXTENSION_ID; +int FileDescriptorHostExt::max_file_descriptors; const Disk* File::find_local_disk_on(const Host* host) { @@ -58,7 +59,7 @@ const Disk* File::find_local_disk_on(const Host* host) host->get_cname()); /* Mount point found, split fullpath_ into mount_name and path+filename*/ mount_point_ = fullpath_.substr(0, longest_prefix_length); - if (mount_point_ == std::string("/")) + if (mount_point_ == "/") path_ = fullpath_; else path_ = fullpath_.substr(longest_prefix_length, fullpath_.length()); @@ -77,16 +78,15 @@ File::File(const std::string& fullpath, const_sg_host_t host, void* userdata) : local_disk_ = find_local_disk_on(host); // assign a file descriptor id to the newly opened File - auto* ext = host->extension(); + auto* ext = host->extension(); if (ext->file_descriptor_table == nullptr) { - ext->file_descriptor_table = std::make_unique>(sg_storage_max_file_descriptors); + ext->file_descriptor_table = std::make_unique>(FileDescriptorHostExt::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."); desc_id = ext->file_descriptor_table->back(); ext->file_descriptor_table->pop_back(); - XBT_DEBUG("\tOpen file '%s'", path_.c_str()); std::map>* content = nullptr; content = local_disk_->extension()->get_content(); @@ -95,6 +95,7 @@ File::File(const std::string& fullpath, const_sg_host_t host, void* userdata) : auto sz = content->find(path_); if (sz != content->end()) { size_ = sz->second; + XBT_DEBUG("\tOpen file '%s', size %llu", path_.c_str(), size_); } else { size_ = 0; content->insert({path_, size_}); @@ -118,8 +119,7 @@ File* File::open(const std::string& fullpath, const_sg_host_t host, void* userda void File::close() { - std::vector* desc_table = - Host::current()->extension()->file_descriptor_table.get(); + std::vector* desc_table = Host::current()->extension()->file_descriptor_table.get(); kernel::actor::simcall_answered([this, desc_table] { desc_table->push_back(this->desc_id); }); delete this; } @@ -191,11 +191,6 @@ sg_size_t File::write(sg_size_t size, bool write_inside) local_disk_->extension()->decr_used_size(size_ - current_position_); write_size = local_disk_->write(size); update_position(current_position_ + write_size); - kernel::actor::simcall_answered([this] { - std::map>* content = local_disk_->extension()->get_content(); - content->erase(path_); - content->insert({path_, size_}); - }); return write_size; } @@ -232,8 +227,15 @@ void File::update_position(sg_offset_t position) xbt_assert(position >= 0, "Error in seek, cannot seek before file %s", get_path()); current_position_ = position; if(current_position_>size_){ + XBT_DEBUG("Updating size of file %s from %llu to %lld", path_.c_str(), size_, position); local_disk_->extension()->incr_used_size(current_position_-size_); size_ = current_position_; + + kernel::actor::simcall_answered([this] { + std::map>* content = local_disk_->extension()->get_content(); + content->erase(path_); + content->insert({path_, size_}); + }); } } @@ -245,7 +247,7 @@ sg_size_t File::tell() const 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) { + if (fullpath.rfind(mount_point_, 0) == 0) { std::map>* content = nullptr; content = local_disk_->extension()->get_content(); if (content) { @@ -275,10 +277,9 @@ int File::unlink() const XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), name); return -1; } else { - XBT_DEBUG("UNLINK %s on disk '%s'", path_.c_str(), name); + XBT_DEBUG("UNLINK %s of size %llu on disk '%s'", path_.c_str(), size_, name); local_disk_->extension()->decr_used_size(size_); - // Remove the file from storage content->erase(path_); @@ -306,7 +307,7 @@ int File::remote_copy(sg_host_t host, const std::string& fullpath) for (auto const& disk : host->get_disks()) { std::string current_mount = disk->extension()->get_mount_point(); - std::string mount_point = std::string(fullpath).substr(0, current_mount.length()); + std::string mount_point = fullpath.substr(0, current_mount.length()); if (mount_point == current_mount && current_mount.length() > longest_prefix_length) { /* The current mount name is found in the full path and is bigger than the previous*/ longest_prefix_length = current_mount.length(); @@ -347,9 +348,9 @@ FileSystemDiskExt::FileSystemDiskExt(const Disk* ptr) } if (const char* current_mount_str = ptr->get_property("mount")) - mount_point_ = std::string(current_mount_str); + mount_point_ = current_mount_str; else - mount_point_ = std::string("/"); + mount_point_ = "/"; if (const char* content_str = ptr->get_property("content")) content_.reset(parse_content(content_str)); @@ -362,9 +363,9 @@ std::map>* FileSystemDiskExt::parse_content( auto* parse_content = new std::map>(); - auto fs = std::unique_ptr(surf_ifsopen(filename)); + auto fs = std::unique_ptr(simgrid::xbt::path_ifsopen(filename)); xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(), - (boost::join(surf_path, ":")).c_str()); + simgrid::xbt::path_to_string().c_str()); std::string line; std::vector tokens; @@ -417,28 +418,28 @@ static void on_platform_created() { for (auto const& host : simgrid::s4u::Engine::get_instance()->get_all_hosts()) { const char* remote_disk_str = host->get_property("remote_disk"); - if (remote_disk_str) { - std::vector tokens; - boost::split(tokens, remote_disk_str, boost::is_any_of(":")); - std::string mount_point = tokens[0]; - 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"); - - const simgrid::s4u::Disk* disk = nullptr; - for (auto const& d : remote_host->get_disks()) - if (d->get_name() == tokens[1]) { - disk = d; - break; - } - - xbt_assert(disk, "You're trying to mount a disk that does not exist. Please check your platform file"); - disk->extension()->add_remote_mount(remote_host, mount_point); - host->add_disk(disk); - - XBT_DEBUG("Host '%s' wants to mount a remote disk: %s of %s mounted on %s", host->get_cname(), disk->get_cname(), - remote_host->get_cname(), mount_point.c_str()); - XBT_DEBUG("Host '%s' now has %zu disks", host->get_cname(), host->get_disks().size()); - } + if (not remote_disk_str) + continue; + std::vector tokens; + boost::split(tokens, remote_disk_str, boost::is_any_of(":")); + std::string mount_point = tokens[0]; + 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"); + + const simgrid::s4u::Disk* disk = nullptr; + for (auto const& d : remote_host->get_disks()) + if (d->get_name() == tokens[1]) { + disk = d; + break; + } + + xbt_assert(disk, "You're trying to mount a disk that does not exist. Please check your platform file"); + disk->extension()->add_remote_mount(remote_host, mount_point); + host->add_disk(disk); + + XBT_DEBUG("Host '%s' wants to mount a remote disk: %s of %s mounted on %s", host->get_cname(), disk->get_cname(), + remote_host->get_cname(), mount_point.c_str()); + XBT_DEBUG("Host '%s' now has %zu disks", host->get_cname(), host->get_disks().size()); } } @@ -468,8 +469,8 @@ static void on_simulation_end() */ void sg_storage_file_system_init() { - sg_storage_max_file_descriptors = 1024; - simgrid::config::bind_flag(sg_storage_max_file_descriptors, "storage/max_file_descriptors", + FileDescriptorHostExt::max_file_descriptors = 1024; + simgrid::config::bind_flag(FileDescriptorHostExt::max_file_descriptors, "storage/max_file_descriptors", "Maximum number of concurrently opened files per host. Default is 1024"); if (not FileSystemDiskExt::EXTENSION_ID.valid()) {