X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/691ad8fcfd10c7c03c272897ff3f309abadf3043..4c753f8d4cabd4104f3f7109823f16be2ebdcce3:/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 46dcac8c7f..31f743a4f5 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -1,23 +1,24 @@ -/* Copyright (c) 2015-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2022. 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. */ -#include "simgrid/plugins/file_system.h" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Comm.hpp" -#include "simgrid/s4u/Engine.hpp" -#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 +#include +#include +#include + +#include "src/surf/surf_interface.hpp" -#include #include -#include #include #include -#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files"); @@ -37,9 +38,9 @@ namespace s4u { simgrid::xbt::Extension FileSystemDiskExt::EXTENSION_ID; simgrid::xbt::Extension FileDescriptorHostExt::EXTENSION_ID; -Disk* File::find_local_disk_on(const Host* host) +const Disk* File::find_local_disk_on(const Host* host) { - Disk* d = nullptr; + const Disk* d = nullptr; size_t longest_prefix_length = 0; for (auto const& disk : host->get_disks()) { std::string current_mount; @@ -53,15 +54,15 @@ Disk* File::find_local_disk_on(const Host* host) longest_prefix_length = current_mount.length(); d = disk; } - if (longest_prefix_length > 0) { /* Mount point found, split fullpath_ into mount_name and path+filename*/ - mount_point_ = fullpath_.substr(0, longest_prefix_length); - if (mount_point_ == std::string("/")) - path_ = fullpath_; - else - path_ = fullpath_.substr(longest_prefix_length, fullpath_.length()); - XBT_DEBUG("%s + %s", mount_point_.c_str(), path_.c_str()); - } else - xbt_die("Can't find mount point for '%s' on '%s'", fullpath_.c_str(), host->get_cname()); + xbt_assert(longest_prefix_length > 0, "Can't find mount point for '%s' on '%s'", fullpath_.c_str(), + 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_ == "/") + path_ = fullpath_; + else + path_ = fullpath_.substr(longest_prefix_length, fullpath_.length()); + XBT_DEBUG("%s + %s", mount_point_.c_str(), path_.c_str()); } return d; } @@ -70,7 +71,7 @@ File::File(const std::string& fullpath, void* userdata) : File(fullpath, Host::c File::File(const std::string& fullpath, const_sg_host_t host, void* userdata) : fullpath_(fullpath) { - kernel::actor::simcall([this, &host, userdata] { + kernel::actor::simcall_answered([this, &host, userdata] { this->set_data(userdata); // this cannot fail because we get a xbt_die if the mountpoint does not exist local_disk_ = find_local_disk_on(host); @@ -85,7 +86,6 @@ File::File(const std::string& fullpath, const_sg_host_t host, void* userdata) : 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(); @@ -94,6 +94,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_}); @@ -103,11 +104,24 @@ File::File(const std::string& fullpath, const_sg_host_t host, void* userdata) : }); } -File::~File() +File::~File() = default; + +File* File::open(const std::string& fullpath, void* userdata) +{ + return new File(fullpath, userdata); +} + +File* File::open(const std::string& fullpath, const_sg_host_t host, void* userdata) +{ + return new File(fullpath, host, userdata); +} + +void File::close() { std::vector* desc_table = Host::current()->extension()->file_descriptor_table.get(); - kernel::actor::simcall([this, desc_table] { desc_table->push_back(this->desc_id); }); + kernel::actor::simcall_answered([this, desc_table] { desc_table->push_back(this->desc_id); }); + delete this; } void File::dump() const @@ -152,6 +166,7 @@ sg_size_t File::read(sg_size_t size) * @ingroup plugin_filesystem * * @param size of the file to write + * @param write_inside * @return the number of bytes successfully write or -1 if an error occurred */ sg_size_t File::write(sg_size_t size, bool write_inside) @@ -161,9 +176,7 @@ sg_size_t File::write(sg_size_t size, bool write_inside) sg_size_t write_size = 0; /* Find the host where the file is physically located (remote or local)*/ - Host* host = local_disk_->get_host(); - - if (host && host->get_name() != Host::current()->get_name()) { + if (Host* host = local_disk_->get_host(); host && host->get_name() != Host::current()->get_name()) { /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */ XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", host->get_cname(), size); Comm::sendto(Host::current(), host, size); @@ -173,25 +186,11 @@ sg_size_t File::write(sg_size_t size, bool write_inside) // If the disk is full before even starting to write if (sg_disk_get_size_used(local_disk_) >= sg_disk_get_size(local_disk_)) return 0; - if (not write_inside) { + if (not write_inside) /* Subtract the part of the file that might disappear from the used sized on the storage element */ local_disk_->extension()->decr_used_size(size_ - current_position_); - write_size = local_disk_->write(size); - local_disk_->extension()->incr_used_size(write_size); - current_position_ += write_size; - size_ = current_position_; - } else { - write_size = local_disk_->write(size); - current_position_ += write_size; - if (current_position_ > size_) - size_ = current_position_; - } - kernel::actor::simcall([this] { - std::map>* content = local_disk_->extension()->get_content(); - - content->erase(path_); - content->insert({path_, size_}); - }); + write_size = local_disk_->write(size); + update_position(current_position_ + write_size); return write_size; } @@ -210,19 +209,36 @@ void File::seek(sg_offset_t offset, int origin) { switch (origin) { case SEEK_SET: - current_position_ = offset; - break; + update_position(offset); + break; case SEEK_CUR: - current_position_ += offset; + update_position(current_position_ + offset); break; case SEEK_END: - current_position_ = size_ + offset; + update_position(size_ + offset); break; default: break; } } +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_}); + }); + } +} + sg_size_t File::tell() const { return current_position_; @@ -261,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_); @@ -292,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(); @@ -312,8 +327,9 @@ int File::remote_copy(sg_host_t host, const std::string& fullpath) } /* Create file on remote host, write it and close it */ - File fd(fullpath, dst_host, nullptr); - fd.write(read_size); + auto* fd = File::open(fullpath, dst_host, nullptr); + fd->write(read_size); + fd->close(); return 0; } @@ -326,19 +342,17 @@ int File::remote_move(sg_host_t host, const std::string& 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(dummyfile, -1, size_str, "disk size", ptr->get_name()); + if (const char* size_str = ptr->get_property("size")) { + std::string dummyfile; + size_ = xbt_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) - mount_point_ = std::string(current_mount_str); + if (const char* current_mount_str = ptr->get_property("mount")) + mount_point_ = current_mount_str; else - mount_point_ = std::string("/"); + mount_point_ = "/"; - const char* content_str = ptr->get_property("content"); - if (content_str) + if (const char* content_str = ptr->get_property("content")) content_.reset(parse_content(content_str)); } @@ -370,14 +384,19 @@ std::map>* FileSystemDiskExt::parse_content( return parse_content; } +void FileSystemDiskExt::add_remote_mount(Host* host, const std::string& mount_point) +{ + remote_mount_points_.try_emplace(host, mount_point); +} + void FileSystemDiskExt::decr_used_size(sg_size_t size) { - simgrid::kernel::actor::simcall([this, size] { used_size_ -= size; }); + simgrid::kernel::actor::simcall_answered([this, size] { used_size_ -= size; }); } void FileSystemDiskExt::incr_used_size(sg_size_t size) { - simgrid::kernel::actor::simcall([this, size] { used_size_ += size; }); + simgrid::kernel::actor::simcall_answered([this, size] { used_size_ += size; }); } } } @@ -399,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()); } } @@ -456,20 +475,20 @@ void sg_storage_file_system_init() if (not FileSystemDiskExt::EXTENSION_ID.valid()) { FileSystemDiskExt::EXTENSION_ID = simgrid::s4u::Disk::extension_create(); - simgrid::s4u::Disk::on_creation.connect(&on_disk_creation); + simgrid::s4u::Disk::on_creation_cb(&on_disk_creation); } if (not FileDescriptorHostExt::EXTENSION_ID.valid()) { FileDescriptorHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - simgrid::s4u::Host::on_creation.connect(&on_host_creation); + simgrid::s4u::Host::on_creation_cb(&on_host_creation); } - simgrid::s4u::Engine::on_platform_created.connect(&on_platform_created); - simgrid::s4u::Engine::on_simulation_end.connect(&on_simulation_end); + simgrid::s4u::Engine::on_platform_created_cb(&on_platform_created); + simgrid::s4u::Engine::on_simulation_end_cb(&on_simulation_end); } sg_file_t sg_file_open(const char* fullpath, void* data) { - return new simgrid::s4u::File(fullpath, data); + return simgrid::s4u::File::open(fullpath, data); } sg_size_t sg_file_read(sg_file_t fd, sg_size_t size) @@ -482,9 +501,9 @@ sg_size_t sg_file_write(sg_file_t fd, sg_size_t size) return fd->write(size); } -void sg_file_close(const_sg_file_t fd) +void sg_file_close(sg_file_t fd) { - delete fd; + fd->close(); } /** Retrieves the path to the file @@ -514,7 +533,7 @@ void sg_file_dump(const_sg_file_t fd) */ void* sg_file_get_data(const_sg_file_t fd) { - return fd->get_data(); + return fd->get_data(); } /** Changes the user data associated with the file @@ -553,7 +572,7 @@ void sg_file_move(const_sg_file_t fd, const char* fullpath) void sg_file_unlink(sg_file_t fd) { fd->unlink(); - delete fd; + fd->close(); } /**