From 46df9f38f01f259164d20cd44a30529ac7aeecdf Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 2 Feb 2021 21:53:36 +0100 Subject: [PATCH] Storage-kill: clean file system plugin --- include/simgrid/plugins/file_system.h | 7 - src/plugins/file_system/s4u_FileSystem.cpp | 327 +++------------------ 2 files changed, 41 insertions(+), 293 deletions(-) diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h index e55ebeb49d..0c53463dd4 100644 --- a/include/simgrid/plugins/file_system.h +++ b/include/simgrid/plugins/file_system.h @@ -46,13 +46,6 @@ XBT_PUBLIC sg_size_t sg_disk_get_size_used(const_sg_disk_t d); XBT_PUBLIC sg_size_t sg_disk_get_size(const_sg_disk_t d); XBT_PUBLIC const char* sg_disk_get_mount_point(const_sg_disk_t d); -XBT_PUBLIC sg_size_t sg_storage_get_size_free(const_sg_storage_t st); -XBT_PUBLIC sg_size_t sg_storage_get_size_used(const_sg_storage_t st); -XBT_PUBLIC sg_size_t sg_storage_get_size(const_sg_storage_t st); -XBT_PUBLIC xbt_dict_t sg_storage_get_content(const_sg_storage_t storage); - -XBT_PUBLIC xbt_dict_t sg_host_get_storage_content(sg_host_t host); - #if SIMGRID_HAVE_MSG typedef sg_file_t msg_file_t; // MSG backwards compatibility diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index b85bdb611a..aaaa935127 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -34,34 +34,8 @@ template class xbt::Extendable; namespace s4u { simgrid::xbt::Extension FileSystemDiskExt::EXTENSION_ID; -simgrid::xbt::Extension FileSystemStorageExt::EXTENSION_ID; simgrid::xbt::Extension FileDescriptorHostExt::EXTENSION_ID; -Storage* File::find_local_storage_on(Host* host) -{ - Storage* st = nullptr; - size_t longest_prefix_length = 0; - XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath_.c_str(), host->get_cname()); - - for (auto const& mnt : host->get_mounted_storages()) { - XBT_DEBUG("See '%s'", mnt.first.c_str()); - mount_point_ = fullpath_.substr(0, mnt.first.length()); - - if (mount_point_ == mnt.first && mnt.first.length() > longest_prefix_length) { - /* The current mount name is found in the full path and is bigger than the previous*/ - longest_prefix_length = mnt.first.length(); - st = mnt.second; - } - } - if (longest_prefix_length > 0) { /* Mount point found, split fullpath_ into mount_name and path+filename*/ - mount_point_ = fullpath_.substr(0, longest_prefix_length); - path_ = fullpath_.substr(longest_prefix_length, fullpath_.length()); - } else - xbt_die("Can't find mount point for '%s' on '%s'", fullpath_.c_str(), host->get_cname()); - - return st; -} - Disk* File::find_local_disk_on(const Host* host) { Disk* d = nullptr; @@ -98,12 +72,7 @@ File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpa 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()) { - local_storage_ = find_local_storage_on(host); - } - if (not host->get_disks().empty()) { - local_disk_ = find_local_disk_on(host); - } + local_disk_ = find_local_disk_on(host); // assign a file descriptor id to the newly opened File auto* ext = host->extension(); @@ -117,11 +86,7 @@ File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpa XBT_DEBUG("\tOpen file '%s'", path_.c_str()); std::map>* content = nullptr; - if (local_storage_) - content = local_storage_->extension()->get_content(); - - if (local_disk_) - content = local_disk_->extension()->get_content(); + content = local_disk_->extension()->get_content(); // if file does not exist create an empty file if (content) { @@ -146,25 +111,15 @@ File::~File() void File::dump() const { - if (local_storage_) - XBT_INFO("File Descriptor information:\n" - "\t\tFull path: '%s'\n" - "\t\tSize: %llu\n" - "\t\tMount point: '%s'\n" - "\t\tStorage Id: '%s'\n" - "\t\tStorage Type: '%s'\n" - "\t\tFile Descriptor Id: %d", - get_path(), size_, mount_point_.c_str(), local_storage_->get_cname(), local_storage_->get_type(), desc_id); - if (local_disk_) - XBT_INFO("File Descriptor information:\n" - "\t\tFull path: '%s'\n" - "\t\tSize: %llu\n" - "\t\tMount point: '%s'\n" - "\t\tDisk Id: '%s'\n" - "\t\tHost Id: '%s'\n" - "\t\tFile Descriptor Id: %d", - get_path(), size_, mount_point_.c_str(), local_disk_->get_cname(), local_disk_->get_host()->get_cname(), - desc_id); + XBT_INFO("File Descriptor information:\n" + "\t\tFull path: '%s'\n" + "\t\tSize: %llu\n" + "\t\tMount point: '%s'\n" + "\t\tDisk Id: '%s'\n" + "\t\tHost Id: '%s'\n" + "\t\tFile Descriptor Id: %d", + get_path(), size_, mount_point_.c_str(), local_disk_->get_cname(), local_disk_->get_host()->get_cname(), + desc_id); } sg_size_t File::read(sg_size_t size) @@ -176,19 +131,10 @@ sg_size_t File::read(sg_size_t size) sg_size_t to_read = std::min(size, size_ - current_position_); sg_size_t read_size = 0; - if (local_storage_) { - /* Find the host where the file is physically located and read it */ - host = local_storage_->get_host(); - XBT_DEBUG("READ %s on disk '%s'", get_path(), local_storage_->get_cname()); - read_size = local_storage_->read(to_read); - } - - if (local_disk_) { - /* Find the host where the file is physically located and read it */ - host = local_disk_->get_host(); - XBT_DEBUG("READ %s on disk '%s'", get_path(), local_disk_->get_cname()); - read_size = local_disk_->read(to_read); - } + /* Find the host where the file is physically located and read it */ + host = local_disk_->get_host(); + XBT_DEBUG("READ %s on disk '%s'", get_path(), local_disk_->get_cname()); + read_size = local_disk_->read(to_read); current_position_ += read_size; @@ -207,8 +153,11 @@ sg_size_t File::read(sg_size_t size) * @param size of the file to write * @return the number of bytes successfully write or -1 if an error occurred */ -sg_size_t File::write_on_disk(sg_size_t size, bool write_inside) +sg_size_t File::write(sg_size_t size, bool write_inside) { + if (size == 0) /* Nothing to write, return */ + return 0; + sg_size_t write_size = 0; /* Find the host where the file is physically located (remote or local)*/ Host* host = local_disk_->get_host(); @@ -220,7 +169,7 @@ sg_size_t File::write_on_disk(sg_size_t size, bool write_inside) } XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu' '%llu:%llu'", get_path(), local_disk_->get_cname(), size, size_, sg_disk_get_size_used(local_disk_), sg_disk_get_size(local_disk_)); - // If the storage is full before even starting to write + // 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) { @@ -246,60 +195,6 @@ sg_size_t File::write_on_disk(sg_size_t size, bool write_inside) return write_size; } -sg_size_t File::write_on_storage(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_storage_->get_host(); - - if (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); - Host::current()->sendto(host, size); - } - - XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu' '%llu:%llu'", get_path(), local_storage_->get_cname(), size, size_, - sg_storage_get_size_used(local_storage_), sg_storage_get_size(local_storage_)); - // If the storage is full before even starting to write - if (sg_storage_get_size_used(local_storage_) >= sg_storage_get_size(local_storage_)) - return 0; - if (not write_inside) { - /* Subtract the part of the file that might disappear from the used sized on the storage element */ - local_storage_->extension()->decr_used_size(size_ - current_position_); - write_size = local_storage_->write(size); - local_storage_->extension()->incr_used_size(write_size); - current_position_ += write_size; - size_ = current_position_; - } else { - write_size = local_storage_->write(size); - current_position_ += write_size; - if (current_position_ > size_) - size_ = current_position_; - } - kernel::actor::simcall([this] { - std::map>* content = - local_storage_->extension()->get_content(); - - content->erase(path_); - content->insert({path_, size_}); - }); - - return write_size; -} - -sg_size_t File::write(sg_size_t size, bool write_inside) -{ - if (size == 0) /* Nothing to write, return */ - return 0; - - if (local_disk_) - return write_on_disk(size, write_inside); - if (local_storage_) - return write_on_storage(size, write_inside); - - return 0; -} - sg_size_t File::size() const { return size_; @@ -337,10 +232,7 @@ 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; - if (local_storage_) - content = local_storage_->extension()->get_content(); - if (local_disk_) - content = local_disk_->extension()->get_content(); + content = local_disk_->extension()->get_content(); if (content) { auto sz = content->find(path_); if (sz != content->end()) { // src file exists @@ -363,14 +255,8 @@ int File::unlink() const /* Check if the file is on local storage */ std::map>* content = nullptr; const char* name = ""; - if (local_storage_) { - content = local_storage_->extension()->get_content(); - name = local_storage_->get_cname(); - } - if (local_disk_) { - content = local_disk_->extension()->get_content(); - name = local_disk_->get_cname(); - } + content = local_disk_->extension()->get_content(); + name = local_disk_->get_cname(); if (not content || content->find(path_) == content->end()) { XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), name); @@ -378,11 +264,7 @@ int File::unlink() const } else { XBT_DEBUG("UNLINK %s on disk '%s'", path_.c_str(), name); - if (local_storage_) - local_storage_->extension()->decr_used_size(size_); - - if (local_disk_) - local_disk_->extension()->decr_used_size(size_); + local_disk_->extension()->decr_used_size(size_); // Remove the file from storage content->erase(path_); @@ -402,55 +284,26 @@ int File::remote_copy(sg_host_t host, const std::string& fullpath) seek(0, SEEK_SET); - if (local_storage_) { - src_host = local_storage_->get_host(); - XBT_DEBUG("READ %s on disk '%s'", get_path(), local_storage_->get_cname()); - read_size = local_storage_->read(size_); - current_position_ += read_size; - - /* Find the host that owns the storage where the file has to be copied */ - const Storage* storage_dest = nullptr; - - for (auto const& elm : host->get_mounted_storages()) { - std::string mount_point = std::string(fullpath).substr(0, elm.first.size()); - if (mount_point == elm.first && elm.first.length() > longest_prefix_length) { - /* The current mount name is found in the full path and is bigger than the previous*/ - longest_prefix_length = elm.first.length(); - storage_dest = elm.second; - } - } + src_host = local_disk_->get_host(); + XBT_DEBUG("READ %s on disk '%s'", get_path(), local_disk_->get_cname()); + read_size = local_disk_->read(size_); + current_position_ += read_size; - if (storage_dest != nullptr) { - /* 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.c_str(), host->get_cname()); - return -1; - } - } + const Disk* dst_disk = nullptr; - if (local_disk_) { - src_host = local_disk_->get_host(); - XBT_DEBUG("READ %s on disk '%s'", get_path(), local_disk_->get_cname()); - read_size = local_disk_->read(size_); - current_position_ += read_size; - - const Disk* dst_disk = nullptr; - - 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()); - 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(); - dst_disk = disk; - } + 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()); + 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(); + dst_disk = disk; } + } - if (dst_disk == nullptr) { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); - return -1; - } + if (dst_disk == nullptr) { + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); + return -1; } if (src_host) { @@ -461,13 +314,7 @@ 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); - 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_; - } - if (local_disk_) - fd.write(read_size); + fd.write(read_size); return 0; } @@ -496,11 +343,6 @@ FileSystemDiskExt::FileSystemDiskExt(const Disk* ptr) content_.reset(parse_content(content_str)); } -FileSystemStorageExt::FileSystemStorageExt(const Storage* ptr) : size_(ptr->get_impl()->size_) -{ - content_.reset(parse_content(ptr->get_impl()->content_name_)); -} - std::map>* FileSystemDiskExt::parse_content(const std::string& filename) { if (filename.empty()) @@ -529,44 +371,6 @@ std::map>* FileSystemDiskExt::parse_content( return parse_content; } -std::map>* FileSystemStorageExt::parse_content(const std::string& filename) -{ - if (filename.empty()) - return nullptr; - - auto* parse_content = new std::map>(); - - 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()); - - std::string line; - std::vector tokens; - do { - std::getline(*fs, line); - boost::trim(line); - if (line.length() > 0) { - boost::split(tokens, line, boost::is_any_of(" \t"), boost::token_compress_on); - xbt_assert(tokens.size() == 2, "Parse error in %s: %s", filename.c_str(), line.c_str()); - sg_size_t size = std::stoull(tokens.at(1)); - - used_size_ += size; - parse_content->insert({tokens.front(), size}); - } - } while (not fs->eof()); - return parse_content; -} - -void FileSystemStorageExt::decr_used_size(sg_size_t size) -{ - simgrid::kernel::actor::simcall([this, size] { used_size_ -= size; }); -} - -void FileSystemStorageExt::incr_used_size(sg_size_t size) -{ - simgrid::kernel::actor::simcall([this, size] { used_size_ += size; }); -} - void FileSystemDiskExt::decr_used_size(sg_size_t size) { simgrid::kernel::actor::simcall([this, size] { used_size_ -= size; }); @@ -581,16 +385,11 @@ void FileSystemDiskExt::incr_used_size(sg_size_t size) using simgrid::s4u::FileDescriptorHostExt; using simgrid::s4u::FileSystemDiskExt; -using simgrid::s4u::FileSystemStorageExt; static void on_disk_creation(simgrid::s4u::Disk& d) { d.extension_set(new FileSystemDiskExt(&d)); } -static void on_storage_creation(simgrid::s4u::Storage& st) -{ - st.extension_set(new FileSystemStorageExt(&st)); -} static void on_host_creation(simgrid::s4u::Host& host) { @@ -656,11 +455,6 @@ void sg_storage_file_system_init() simgrid::config::bind_flag(sg_storage_max_file_descriptors, "storage/max_file_descriptors", "Maximum number of concurrently opened files per host. Default is 1024"); - if (not FileSystemStorageExt::EXTENSION_ID.valid()) { - FileSystemStorageExt::EXTENSION_ID = simgrid::s4u::Storage::extension_create(); - simgrid::s4u::Storage::on_creation.connect(&on_storage_creation); - } - if (not FileSystemDiskExt::EXTENSION_ID.valid()) { FileSystemDiskExt::EXTENSION_ID = simgrid::s4u::Disk::extension_create(); simgrid::s4u::Disk::on_creation.connect(&on_disk_creation); @@ -810,42 +604,3 @@ const char* sg_disk_get_mount_point(const_sg_disk_t d) { return d->extension()->get_mount_point(); } - -sg_size_t sg_storage_get_size_free(const_sg_storage_t st) -{ - return st->extension()->get_size() - st->extension()->get_used_size(); -} - -sg_size_t sg_storage_get_size_used(const_sg_storage_t st) -{ - return st->extension()->get_used_size(); -} - -sg_size_t sg_storage_get_size(const_sg_storage_t st) -{ - return st->extension()->get_size(); -} - -xbt_dict_t sg_storage_get_content(const_sg_storage_t storage) -{ - 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) { - auto* psize = new sg_size_t(entry.second); - xbt_dict_set(content_as_dict, entry.first.c_str(), psize); - } - return content_as_dict; -} - -xbt_dict_t sg_host_get_storage_content(sg_host_t host) -{ - xbt_assert((host != nullptr), "Invalid parameters"); - xbt_dict_t contents = xbt_dict_new_homogeneous(nullptr); - for (auto const& elm : host->get_mounted_storages()) - xbt_dict_set(contents, elm.first.c_str(), sg_storage_get_content(elm.second)); - - return contents; -} -- 2.20.1