X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e22304ac763eda6122ced2baa724139e606b2ad..2438e2b51884fd93b9a429b4302b1edb4fd0161c:/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 056ffa9131..b32fd5137e 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -23,18 +23,18 @@ namespace s4u { 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()); + XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath_.c_str(), host->get_cname()); - for (auto const& mnt : host->getMountedStorages()) { + for (auto const& mnt : host->get_mounted_storages()) { XBT_DEBUG("See '%s'", mnt.first.c_str()); - mount_point_ = fullpath.substr(0, mnt.first.length()); + 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*/ @@ -42,18 +42,18 @@ File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(ful 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()); + 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()); + xbt_die("Can't find mount point for '%s' on '%s'", fullpath_.c_str(), host->get_cname()); local_storage_ = st; // 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."); @@ -87,7 +87,7 @@ void File::dump() "\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_->getType(), desc_id); + get_path(), size_, mount_point_.c_str(), local_storage_->get_cname(), local_storage_->get_type(), desc_id); } sg_size_t File::read(sg_size_t size) @@ -96,61 +96,58 @@ sg_size_t File::read(sg_size_t size) return 0; /* Find the host where the file is physically located and read it */ - Host* host = local_storage_->getHost(); + 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 sg_size_t read_size = local_storage_->read(std::min(size, size_ - current_position_)); current_position_ += read_size; - if (strcmp(host->get_cname(), Host::current()->get_cname())) { + 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* 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); + host->send_to(Host::current(), 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; /* Find the host where the file is physically located (remote or local)*/ - Host* host = local_storage_->getHost(); + Host* host = local_storage_->get_host(); - if (strcmp(host->get_cname(), Host::current()->get_cname())) { + 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* 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); + Host::current()->send_to(host, size); } - XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", get_path(), local_storage_->get_cname(), size, 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; - /* 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_); - - sg_size_t write_size = local_storage_->write(size); - local_storage_->extension()->incr_used_size(write_size); - - current_position_ += write_size; - size_ = current_position_; + if (sg_storage_get_size_used(local_storage_) >= sg_storage_get_size(local_storage_)) + return 0; + sg_size_t write_size=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(); content->erase(path_); @@ -191,10 +188,10 @@ 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())) { + if (fullpath.compare(0, mount_point_.length(), mount_point_) == 0) { std::map* content = local_storage_->extension()->get_content(); auto sz = content->find(path_); if (sz != content->end()) { // src file exists @@ -234,7 +231,7 @@ 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 = local_storage_; - Host* src_host = storage_src->getHost(); + Host* src_host = storage_src->get_host(); seek(0, SEEK_SET); 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 @@ -246,7 +243,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) Host* dst_host; size_t longest_prefix_length = 0; - for (auto const& elm : host->getMountedStorages()) { + 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*/ @@ -257,19 +254,15 @@ int File::remote_copy(sg_host_t host, const char* fullpath) if (storage_dest != nullptr) { /* Mount point found, retrieve the host the storage is attached to */ - dst_host = storage_dest->getHost(); + 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; } 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); + storage_dest->get_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); @@ -289,16 +282,11 @@ int File::remote_move(sg_host_t host, const char* fullpath) FileSystemStorageExt::FileSystemStorageExt(simgrid::s4u::Storage* ptr) { - content_ = parse_content(ptr->getImpl()->content_name); - size_ = ptr->getImpl()->size_; + content_.reset(parse_content(ptr->get_impl()->content_name_)); + size_ = ptr->get_impl()->size_; } -FileSystemStorageExt::~FileSystemStorageExt() -{ - delete content_; -} - -std::map* FileSystemStorageExt::parse_content(std::string filename) +std::map* FileSystemStorageExt::parse_content(const std::string& filename) { if (filename.empty()) return nullptr; @@ -335,11 +323,6 @@ static void on_storage_creation(simgrid::s4u::Storage& st) st.extension_set(new FileSystemStorageExt(&st)); } -static void on_storage_destruction(simgrid::s4u::Storage& st) -{ - delete st.extension(); -} - static void on_host_creation(simgrid::s4u::Host& host) { host.extension_set(new FileDescriptorHostExt()); @@ -354,13 +337,12 @@ void sg_storage_file_system_init() if (not FileSystemStorageExt::EXTENSION_ID.valid()) { FileSystemStorageExt::EXTENSION_ID = simgrid::s4u::Storage::extension_create(); - simgrid::s4u::Storage::onCreation.connect(&on_storage_creation); - simgrid::s4u::Storage::onDestruction.connect(&on_storage_destruction); + simgrid::s4u::Storage::on_creation.connect(&on_storage_creation); } if (not FileDescriptorHostExt::EXTENSION_ID.valid()) { FileDescriptorHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - simgrid::s4u::Host::onCreation.connect(&on_host_creation); + simgrid::s4u::Host::on_creation.connect(&on_host_creation); } } @@ -411,12 +393,12 @@ void sg_file_set_data(sg_file_t fd, void* data) } /** - * \brief Set the file position indicator in the sg_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,11 +424,11 @@ 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) { @@ -454,11 +436,11 @@ int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* 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) { @@ -498,7 +480,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;