X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f861a9b324ea347f15e94b5f2a789af53549b5a..7d28d93b90eedd2a49da8b9b990296669e46d05c:/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 d6eb6a7227..25c6cafd96 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -9,12 +9,14 @@ #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 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files"); @@ -93,52 +95,56 @@ File::File(const std::string& fullpath, void* userdata) : File(fullpath, Host::c File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath) { - 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); - } + 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); + } - // assign a file descriptor id to the newly opened File - FileDescriptorHostExt* ext = host->extension(); - if (ext->file_descriptor_table == nullptr) { - ext->file_descriptor_table.reset(new std::vector(sg_storage_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(); + // assign a file descriptor id to the newly opened File + auto* ext = host->extension(); + if (ext->file_descriptor_table == nullptr) { + ext->file_descriptor_table = std::make_unique>(sg_storage_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; - if (local_storage_) - content = local_storage_->extension()->get_content(); + 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(); + if (local_disk_) + content = local_disk_->extension()->get_content(); - // if file does not exist create an empty file - if (content) { - auto sz = content->find(path_); - if (sz != content->end()) { - size_ = sz->second; - } else { - size_ = 0; - content->insert({path_, size_}); - XBT_DEBUG("File '%s' was not found, file created.", path_.c_str()); + // if file does not exist create an empty file + if (content) { + auto sz = content->find(path_); + if (sz != content->end()) { + size_ = sz->second; + } else { + size_ = 0; + content->insert({path_, size_}); + XBT_DEBUG("File '%s' was not found, file created.", path_.c_str()); + } } - } + }); } File::~File() { - Host::current()->extension()->file_descriptor_table->push_back(desc_id); + std::vector* desc_table = + Host::current()->extension()->file_descriptor_table.get(); + kernel::actor::simcall([this, desc_table] { desc_table->push_back(this->desc_id); }); } -void File::dump() +void File::dump() const { if (local_storage_) XBT_INFO("File Descriptor information:\n" @@ -229,10 +235,12 @@ sg_size_t File::write_on_disk(sg_size_t size, bool write_inside) if (current_position_ > size_) size_ = current_position_; } - std::map* content = local_disk_->extension()->get_content(); + kernel::actor::simcall([this] { + std::map* content = local_disk_->extension()->get_content(); - content->erase(path_); - content->insert({path_, size_}); + content->erase(path_); + content->insert({path_, size_}); + }); return write_size; } @@ -267,10 +275,12 @@ sg_size_t File::write_on_storage(sg_size_t size, bool write_inside) if (current_position_ > size_) size_ = current_position_; } - std::map* content = local_storage_->extension()->get_content(); + kernel::actor::simcall([this] { + std::map* content = local_storage_->extension()->get_content(); - content->erase(path_); - content->insert({path_, size_}); + content->erase(path_); + content->insert({path_, size_}); + }); return write_size; } @@ -288,7 +298,7 @@ sg_size_t File::write(sg_size_t size, bool write_inside) return 0; } -sg_size_t File::size() +sg_size_t File::size() const { return size_; } @@ -315,12 +325,12 @@ void File::seek(sg_offset_t offset, int origin) } } -sg_size_t File::tell() +sg_size_t File::tell() const { return current_position_; } -void File::move(const std::string& fullpath) +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) { @@ -346,7 +356,7 @@ void File::move(const std::string& fullpath) } } -int File::unlink() +int File::unlink() const { /* Check if the file is on local storage */ std::map* content = nullptr; @@ -379,7 +389,7 @@ int File::unlink() } } -int File::remote_copy(sg_host_t host, const char* fullpath) +int File::remote_copy(sg_host_t host, const std::string& fullpath) { /* Find the host where the file is physically located and read it */ Host* src_host = nullptr; @@ -422,7 +432,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) /* 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, host->get_cname()); + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); return -1; } } @@ -441,7 +451,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) } if (dst_disk == nullptr) { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname()); + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); return -1; } } @@ -453,19 +463,18 @@ int File::remote_copy(sg_host_t host, const char* fullpath) } /* Create file on remote host, write it and close it */ - File* fd = new File(fullpath, dst_host, nullptr); + 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_; + 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); - delete fd; + fd.write(read_size); return 0; } -int File::remote_move(sg_host_t host, const char* fullpath) +int File::remote_move(sg_host_t host, const std::string& fullpath) { int res = remote_copy(host, fullpath); unlink(); @@ -475,8 +484,9 @@ int File::remote_move(sg_host_t host, const char* 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(size_str, "disk size", ptr->get_name()); + size_ = surf_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) @@ -499,9 +509,11 @@ std::map* FileSystemDiskExt::parse_content(const std::st if (filename.empty()) return nullptr; - std::map* parse_content = new std::map(); + auto* parse_content = new std::map(); std::ifstream* fs = 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; @@ -526,9 +538,11 @@ std::map* FileSystemStorageExt::parse_content(const std: if (filename.empty()) return nullptr; - std::map* parse_content = new std::map(); + auto* parse_content = new std::map(); std::ifstream* fs = 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; @@ -547,6 +561,26 @@ std::map* FileSystemStorageExt::parse_content(const std: delete fs; 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; }); +} + +void FileSystemDiskExt::incr_used_size(sg_size_t size) +{ + simgrid::kernel::actor::simcall([this, size] { used_size_ += size; }); +} } } @@ -579,7 +613,7 @@ static void on_platform_created() 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"); - simgrid::s4u::Disk* disk = nullptr; + const simgrid::s4u::Disk* disk = nullptr; for (auto const& d : remote_host->get_disks()) if (d->get_name() == tokens[1]) { disk = d; @@ -668,7 +702,7 @@ void sg_file_close(const_sg_file_t fd) /** Retrieves the path to the file * @ingroup plugin_filesystem */ -const char* sg_file_get_name(sg_file_t fd) +const char* sg_file_get_name(const_sg_file_t fd) { xbt_assert((fd != nullptr), "Invalid file descriptor"); return fd->get_path(); @@ -677,12 +711,12 @@ const char* sg_file_get_name(sg_file_t fd) /** Retrieves the size of the file * @ingroup plugin_filesystem */ -sg_size_t sg_file_get_size(sg_file_t fd) +sg_size_t sg_file_get_size(const_sg_file_t fd) { return fd->size(); } -void sg_file_dump(sg_file_t fd) +void sg_file_dump(const_sg_file_t fd) { fd->dump(); } @@ -718,12 +752,12 @@ void sg_file_seek(sg_file_t fd, sg_offset_t offset, int origin) fd->seek(offset, origin); } -sg_size_t sg_file_tell(sg_file_t fd) +sg_size_t sg_file_tell(const_sg_file_t fd) { return fd->tell(); } -void sg_file_move(sg_file_t fd, const char* fullpath) +void sg_file_move(const_sg_file_t fd, const char* fullpath) { fd->move(fullpath); } @@ -805,8 +839,7 @@ xbt_dict_t sg_storage_get_content(const_sg_storage_t storage) xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete); for (auto const& entry : *content) { - sg_size_t* psize = new sg_size_t; - *psize = entry.second; + auto* psize = new sg_size_t(entry.second); xbt_dict_set(content_as_dict, entry.first.c_str(), psize); } return content_as_dict;