X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52499398fbc12f4d4234cc7c622a0990e3daf094..a493dab29fff80a4d222c18c3057c811b8b06d3f:/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 ad88b620a8..20e5c27c8a 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -71,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); @@ -104,18 +104,26 @@ File::File(const std::string& fullpath, const_sg_host_t host, void* userdata) : }); } -File::~File() -{ - std::vector* desc_table = - Host::current()->extension()->file_descriptor_table.get(); - kernel::actor::simcall([this, desc_table] { desc_table->push_back(this->desc_id); }); -} +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_answered([this, desc_table] { desc_table->push_back(this->desc_id); }); + delete this; +} + void File::dump() const { XBT_INFO("File Descriptor information:\n" @@ -168,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); @@ -193,7 +199,7 @@ sg_size_t File::write(sg_size_t size, bool write_inside) if (current_position_ > size_) size_ = current_position_; } - kernel::actor::simcall([this] { + kernel::actor::simcall_answered([this] { std::map>* content = local_disk_->extension()->get_content(); content->erase(path_); @@ -319,8 +325,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; } @@ -333,19 +340,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) + 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) + if (const char* current_mount_str = ptr->get_property("mount")) mount_point_ = std::string(current_mount_str); else mount_point_ = std::string("/"); - 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)); } @@ -377,14 +382,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; }); } } } @@ -463,15 +473,15 @@ 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) @@ -521,7 +531,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 @@ -560,7 +570,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(); } /**