X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0facf52013684615c801816de974754778c9474a..db9ef2223acb402e44eec406541e671bfebd5ade:/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 bfa07cc1c0..98acd5957a 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"); @@ -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); @@ -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) @@ -186,7 +201,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_); @@ -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; } @@ -329,7 +345,7 @@ 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()); + 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) @@ -370,14 +386,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; }); } } } @@ -456,20 +477,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 +503,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 +535,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 +574,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(); } /**