X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..ebb334ea818bbf3977c4c68e268ea23cdd13103a:/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 3aecd913f2..2b88d165c2 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -1,16 +1,13 @@ -/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2019. 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 "xbt/log.h" - #include "simgrid/plugins/file_system.h" #include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Storage.hpp" -#include "simgrid/simix.hpp" #include "src/surf/HostImpl.hpp" +#include "src/surf/xml/platf_private.hpp" +#include "xbt/config.hpp" #include #include @@ -24,40 +21,69 @@ int sg_storage_max_file_descriptors = 1024; namespace simgrid { namespace s4u { +simgrid::xbt::Extension FileSystemDiskExt::EXTENSION_ID; simgrid::xbt::Extension FileSystemStorageExt::EXTENSION_ID; simgrid::xbt::Extension FileDescriptorHostExt::EXTENSION_ID; -File::File(std::string fullpath, void* userdata) : File(fullpath, Host::current(), userdata){}; +File::File(const std::string& fullpath, void* userdata) : File(fullpath, Host::current(), userdata){}; -File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath), userdata_(userdata) +File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath), userdata_(userdata) { // this cannot fail because we get a xbt_die if the mountpoint does not exist - 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->getMountedStorages()) { - 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 (not host->get_mounted_storages().empty()) { + 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()); + 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()); - localStorage = st; + local_storage_ = st; + } + if (not host->get_disks().empty()) { + Disk* d = nullptr; + size_t longest_prefix_length = 0; + for (auto const& disk : host->get_disks()) { + const char* current_mount_str = disk->get_property("mount"); + if (current_mount_str) { + std::string current_mount = std::string(current_mount_str); + 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(); + 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()); + } + } + local_disk_ = d; + } // assign a file descriptor id to the newly opened File FileDescriptorHostExt* ext = host->extension(); if (ext->file_descriptor_table == nullptr) { - ext->file_descriptor_table = new std::vector(sg_storage_max_file_descriptors); + 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."); @@ -65,7 +91,13 @@ File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(ful ext->file_descriptor_table->pop_back(); XBT_DEBUG("\tOpen file '%s'", path_.c_str()); - std::map* content = localStorage->extension()->getContent(); + std::map* content; + if (local_storage_) + content = local_storage_->extension()->get_content(); + + if (local_disk_) + content = local_disk_->extension()->get_content(); + // if file does not exist create an empty file auto sz = content->find(path_); if (sz != content->end()) { @@ -84,82 +116,128 @@ File::~File() void File::dump() { - 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", - getPath(), size_, mount_point_.c_str(), localStorage->get_cname(), localStorage->getType(), desc_id); + 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); } sg_size_t File::read(sg_size_t size) { if (size_ == 0) /* Nothing to read, return */ return 0; + sg_size_t read_size = 0; + + if (local_storage_) { + /* Find the host where the file is physically located and read it */ + Host* host = local_storage_->get_host(); + XBT_DEBUG("READ %s on disk '%s'", get_path(), local_storage_->get_cname()); + // if the current position is close to the end of the file, we may not be able to read the requested size + read_size = local_storage_->read(std::min(size, size_ - current_position_)); + current_position_ += read_size; + + if (host->get_name() != Host::current()->get_name() && read_size > 0) { + /* 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(), read_size); + host->send_to(Host::current(), read_size); + } + } - /* Find the host where the file is physically located and read it */ - Host* host = localStorage->getHost(); - XBT_DEBUG("READ %s on disk '%s'", getPath(), localStorage->get_cname()); - // if the current position is close to the end of the file, we may not be able to read the requested size - sg_size_t read_size = localStorage->read(std::min(size, size_ - current_position_)); - current_position_ += read_size; - - if (strcmp(host->get_cname(), Host::current()->get_cname())) { - /* 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(), read_size); - Host* m_host_list[] = {Host::current(), host}; - double* flops_amount = new double[2]{0, 0}; - double* bytes_amount = new double[4]{0, 0, static_cast(read_size), 0}; - - this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); + if (local_disk_) { + /* Find the host where the file is physically located and read it */ + XBT_DEBUG("READ %s on disk '%s'", get_path(), local_disk_->get_cname()); + // if the current position is close to the end of the file, we may not be able to read the requested size + read_size = local_disk_->read(std::min(size, size_ - current_position_)); + current_position_ += read_size; } return read_size; } -/** \brief Write into a file (local or remote) +/** @brief Write into a file (local or remote) * - * \param size of the file to write - * \param fd is a the file descriptor - * \return the number of bytes successfully write or -1 if an error occurred + * @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(sg_size_t size) +sg_size_t File::write(sg_size_t size, int 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 = localStorage->getHost(); - - if (strcmp(host->get_cname(), Host::current()->get_cname())) { - /* 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* m_host_list[] = {Host::current(), host}; - double* flops_amount = new double[2]{0, 0}; - double* bytes_amount = new double[4]{0, static_cast(size), 0, 0}; - - this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); - } + if (local_storage_) { + /* Find the host where the file is physically located (remote or local)*/ + Host* host = local_storage_->get_host(); - XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", getPath(), localStorage->get_cname(), size, size_); - // If the storage is full before even starting to write - if (sg_storage_get_size_used(localStorage) >= sg_storage_get_size(localStorage)) - return 0; - /* Substract the part of the file that might disappear from the used sized on the storage element */ - localStorage->extension()->decrUsedSize(size_ - current_position_); + if (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()->send_to(host, size); + } - sg_size_t write_size = localStorage->write(size); - localStorage->extension()->incrUsedSize(write_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 (write_inside == 0) { + /* Substract 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_; + } + std::map* content = local_storage_->extension()->get_content(); - current_position_ += write_size; - size_ = current_position_; - std::map* content = localStorage->extension()->getContent(); + content->erase(path_); + content->insert({path_, size_}); + } - content->erase(path_); - content->insert({path_, size_}); + if (local_disk_) { + 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 (sg_disk_get_size_used(local_disk_) >= sg_disk_get_size(local_disk_)) + return 0; + if (write_inside == 0) { + /* Substract 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_; + } + std::map* content = local_disk_->extension()->get_content(); + content->erase(path_); + content->insert({path_, size_}); + } return write_size; } @@ -195,11 +273,15 @@ sg_size_t File::tell() return current_position_; } -void File::move(std::string fullpath) +void File::move(const std::string& fullpath) { /* Check if the new full path is on the same mount point */ - if (not strncmp(mount_point_.c_str(), fullpath.c_str(), mount_point_.length())) { - std::map* content = localStorage->extension()->getContent(); + if (fullpath.compare(0, mount_point_.length(), mount_point_) == 0) { + std::map* content; + if (local_storage_) + content = local_storage_->extension()->get_content(); + if (local_disk_) + content = local_disk_->extension()->get_content(); auto sz = content->find(path_); if (sz != content->end()) { // src file exists sg_size_t new_size = sz->second; @@ -218,14 +300,28 @@ void File::move(std::string fullpath) int File::unlink() { /* Check if the file is on local storage */ - std::map* content = localStorage->extension()->getContent(); + std::map* content; + const char* name = nullptr; + 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(); + } if (content->find(path_) == content->end()) { - XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), localStorage->get_cname()); + 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(), localStorage->get_cname()); - localStorage->extension()->decrUsedSize(size_); + 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_); // Remove the file from storage content->erase(fullpath_); @@ -234,75 +330,144 @@ int File::unlink() } } -int File::remoteCopy(sg_host_t host, const char* fullpath) +int File::remote_copy(sg_host_t host, const char* fullpath) { /* Find the host where the file is physically located and read it */ - Storage* storage_src = localStorage; - Host* src_host = storage_src->getHost(); + Host* src_host; + if (local_storage_) { + src_host = local_storage_->get_host(); + XBT_DEBUG("READ %s on disk '%s'", get_path(), local_storage_->get_cname()); + } + + if (local_disk_) { + src_host = local_disk_->get_host(); + XBT_DEBUG("READ %s on disk '%s'", get_path(), local_disk_->get_cname()); + } + seek(0, SEEK_SET); - XBT_DEBUG("READ %s on disk '%s'", getPath(), localStorage->get_cname()); // if the current position is close to the end of the file, we may not be able to read the requested size - sg_size_t read_size = localStorage->read(size_); + sg_size_t read_size = 0; + if (local_storage_) + read_size = local_storage_->read(size_); + if (local_disk_) + read_size = local_disk_->read(size_); + current_position_ += read_size; - /* Find the host that owns the storage where the file has to be copied */ - Storage* storage_dest = nullptr; - Host* dst_host; - size_t longest_prefix_length = 0; - - for (auto const& elm : host->getMountedStorages()) { - 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; + Host* dst_host = host; + if (local_storage_) { + /* Find the host that owns the storage where the file has to be copied */ + Storage* storage_dest = nullptr; + size_t longest_prefix_length = 0; + + 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; + } + } + + 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, host->get_cname()); + return -1; } } - if (storage_dest != nullptr) { - /* Mount point found, retrieve the host the storage is attached to */ - dst_host = storage_dest->getHost(); - } else { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname()); - return -1; + if (local_disk_) { + size_t longest_prefix_length = 0; + Disk* dst_disk = nullptr; + + for (auto const& disk : host->get_disks()) { + const char* current_mount_str = disk->get_property("mount"); + if (current_mount_str) { + std::string current_mount = std::string(current_mount_str); + 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, host->get_cname()); + return -1; + } } XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, src_host->get_cname(), - storage_dest->getHost()->get_cname()); - Host* m_host_list[] = {src_host, dst_host}; - double* flops_amount = new double[2]{0, 0}; - double* bytes_amount = new double[4]{0, static_cast(read_size), 0, 0}; - - this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); + dst_host->get_cname()); + src_host->send_to(dst_host, read_size); /* Create file on remote host, write it and close it */ File* fd = new File(fullpath, dst_host, nullptr); - sg_size_t write_size = fd->localStorage->write(read_size); - fd->localStorage->extension()->incrUsedSize(write_size); - (*(fd->localStorage->extension()->getContent()))[path_] = size_; + 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); delete fd; return 0; } -int File::remoteMove(sg_host_t host, const char* fullpath) +int File::remote_move(sg_host_t host, const char* fullpath) { - int res = remoteCopy(host, fullpath); + int res = remote_copy(host, fullpath); unlink(); return res; } +FileSystemDiskExt::FileSystemDiskExt(simgrid::s4u::Disk* ptr) +{ + const char* size_str = ptr->get_property("size"); + const char* content_str = ptr->get_property("content"); + size_ = size_str ? surf_parse_get_size(size_str, "disk size", ptr->get_name()) : 0; + if (content_str) + content_.reset(parse_content(content_str)); +} + FileSystemStorageExt::FileSystemStorageExt(simgrid::s4u::Storage* ptr) { - content_ = parseContent(ptr->getImpl()->content_name); - size_ = ptr->getImpl()->size_; + content_.reset(parse_content(ptr->get_impl()->content_name_)); + size_ = ptr->get_impl()->size_; } -FileSystemStorageExt::~FileSystemStorageExt() +std::map* FileSystemDiskExt::parse_content(const std::string& filename) { - delete content_; + if (filename.empty()) + return nullptr; + + std::map* parse_content = new std::map(); + + std::ifstream* fs = surf_ifsopen(filename); + + 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()); + delete fs; + return parse_content; } -std::map* FileSystemStorageExt::parseContent(std::string filename) +std::map* FileSystemStorageExt::parse_content(const std::string& filename) { if (filename.empty()) return nullptr; @@ -321,7 +486,7 @@ std::map* FileSystemStorageExt::parseContent(std::string 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)); - usedSize_ += size; + used_size_ += size; parse_content->insert({tokens.front(), size}); } } while (not fs->eof()); @@ -331,20 +496,20 @@ std::map* FileSystemStorageExt::parseContent(std::string } } -using simgrid::s4u::FileSystemStorageExt; using simgrid::s4u::FileDescriptorHostExt; +using simgrid::s4u::FileSystemDiskExt; +using simgrid::s4u::FileSystemStorageExt; -static void onStorageCreation(simgrid::s4u::Storage& st) +static void on_disk_creation(simgrid::s4u::Disk& d) { - st.extension_set(new FileSystemStorageExt(&st)); + d.extension_set(new FileSystemDiskExt(&d)); } - -static void onStorageDestruction(simgrid::s4u::Storage& st) +static void on_storage_creation(simgrid::s4u::Storage& st) { - delete st.extension(); + st.extension_set(new FileSystemStorageExt(&st)); } -static void onHostCreation(simgrid::s4u::Host& host) +static void on_host_creation(simgrid::s4u::Host& host) { host.extension_set(new FileDescriptorHostExt()); } @@ -352,15 +517,23 @@ static void onHostCreation(simgrid::s4u::Host& host) /* **************************** Public interface *************************** */ void sg_storage_file_system_init() { + sg_storage_max_file_descriptors = 1024; + 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::onCreation.connect(&onStorageCreation); - simgrid::s4u::Storage::onDestruction.connect(&onStorageDestruction); + 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); } if (not FileDescriptorHostExt::EXTENSION_ID.valid()) { FileDescriptorHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - simgrid::s4u::Host::onCreation.connect(&onHostCreation); + simgrid::s4u::Host::on_creation.connect(&on_host_creation); } } @@ -387,7 +560,7 @@ void sg_file_close(sg_file_t fd) const char* sg_file_get_name(sg_file_t fd) { xbt_assert((fd != nullptr), "Invalid file descriptor"); - return fd->getPath(); + return fd->get_path(); } sg_size_t sg_file_get_size(sg_file_t fd) @@ -402,21 +575,21 @@ void sg_file_dump(sg_file_t fd) void* sg_file_get_data(sg_file_t fd) { - return fd->getUserdata(); + return fd->get_userdata(); } void sg_file_set_data(sg_file_t fd, void* data) { - fd->setUserdata(data); + fd->set_userdata(data); } /** - * \brief Set the file position indicator in the msg_file_t by adding offset bytes + * @brief Set the file position indicator in the sg_file_t by adding offset bytes * to the position specified by origin (either SEEK_SET, SEEK_CUR, or SEEK_END). * - * \param fd : file object that identifies the stream - * \param offset : number of bytes to offset from origin - * \param origin : Position used as reference for the offset. It is specified by one of the following constants defined + * @param fd : file object that identifies the stream + * @param offset : number of bytes to offset from origin + * @param origin : Position used as reference for the offset. It is specified by one of the following constants defined * in \ exclusively to be used as arguments for this function (SEEK_SET = beginning of file, * SEEK_CUR = current position of the file pointer, SEEK_END = end of file) */ @@ -442,47 +615,62 @@ void sg_file_unlink(sg_file_t fd) } /** - * \brief Copy a file to another location on a remote host. - * \param file : the file to move - * \param host : the remote host where the file has to be copied - * \param fullpath : the complete path destination on the remote host - * \return If successful, the function returns 0. Otherwise, it returns -1. + * @brief Copy a file to another location on a remote host. + * @param file : the file to move + * @param host : the remote host where the file has to be copied + * @param fullpath : the complete path destination on the remote host + * @return If successful, the function returns 0. Otherwise, it returns -1. */ int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath) { - return file->remoteCopy(host, fullpath); + return file->remote_copy(host, fullpath); } /** - * \brief Move a file to another location on a remote host. - * \param file : the file to move - * \param host : the remote host where the file has to be moved - * \param fullpath : the complete path destination on the remote host - * \return If successful, the function returns 0. Otherwise, it returns -1. + * @brief Move a file to another location on a remote host. + * @param file : the file to move + * @param host : the remote host where the file has to be moved + * @param fullpath : the complete path destination on the remote host + * @return If successful, the function returns 0. Otherwise, it returns -1. */ int sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath) { - return file->remoteMove(host, fullpath); + return file->remote_move(host, fullpath); +} + +sg_size_t sg_disk_get_size_free(sg_disk_t d) +{ + return d->extension()->get_size() - d->extension()->get_used_size(); +} + +sg_size_t sg_disk_get_size_used(sg_disk_t d) +{ + return d->extension()->get_used_size(); +} + +sg_size_t sg_disk_get_size(sg_disk_t d) +{ + return d->extension()->get_size(); } sg_size_t sg_storage_get_size_free(sg_storage_t st) { - return st->extension()->getSize() - st->extension()->getUsedSize(); + return st->extension()->get_size() - st->extension()->get_used_size(); } sg_size_t sg_storage_get_size_used(sg_storage_t st) { - return st->extension()->getUsedSize(); + return st->extension()->get_used_size(); } sg_size_t sg_storage_get_size(sg_storage_t st) { - return st->extension()->getSize(); + return st->extension()->get_size(); } xbt_dict_t sg_storage_get_content(sg_storage_t storage) { - std::map* content = storage->extension()->getContent(); + 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); @@ -498,7 +686,7 @@ 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->getMountedStorages()) + for (auto const& elm : host->get_mounted_storages()) xbt_dict_set(contents, elm.first.c_str(), sg_storage_get_content(elm.second), nullptr); return contents;