X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..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 eb6ccb3a6b..2b88d165c2 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -6,6 +6,7 @@ #include "simgrid/plugins/file_system.h" #include "simgrid/s4u/Actor.hpp" #include "src/surf/HostImpl.hpp" +#include "src/surf/xml/platf_private.hpp" #include "xbt/config.hpp" #include @@ -20,6 +21,7 @@ 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; @@ -28,27 +30,55 @@ 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), 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->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 (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()); - local_storage_ = 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(); @@ -61,7 +91,13 @@ File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpa ext->file_descriptor_table->pop_back(); XBT_DEBUG("\tOpen file '%s'", path_.c_str()); - std::map* content = local_storage_->extension()->get_content(); + 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()) { @@ -80,36 +116,54 @@ 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", - get_path(), size_, mount_point_.c_str(), local_storage_->get_cname(), local_storage_->get_type(), 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 = 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 (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); - std::vector m_host_list = {Host::current(), host}; - std::vector flops_amount = {0., 0.}; - std::vector bytes_amount = {0., 0., static_cast(read_size), 0.}; - - this_actor::parallel_execute(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; @@ -124,43 +178,66 @@ 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 = local_storage_->get_host(); - - 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); - std::vector m_host_list = {Host::current(), host}; - std::vector flops_amount = {0, 0}; - std::vector bytes_amount = {0, static_cast(size), 0, 0}; + if (local_storage_) { + /* Find the host where the file is physically located (remote or local)*/ + Host* host = local_storage_->get_host(); - this_actor::parallel_execute(m_host_list, flops_amount, bytes_amount); - } + 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); + } - 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; - 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_) + 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(); + + content->erase(path_); + content->insert({path_, size_}); } - std::map* content = local_storage_->extension()->get_content(); - 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; } @@ -200,7 +277,11 @@ void File::move(const std::string& fullpath) { /* Check if the new full path is on the same mount point */ if (fullpath.compare(0, mount_point_.length(), mount_point_) == 0) { - std::map* content = local_storage_->extension()->get_content(); + 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; @@ -219,14 +300,28 @@ void File::move(const std::string& fullpath) int File::unlink() { /* Check if the file is on local storage */ - std::map* content = local_storage_->extension()->get_content(); + 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(), local_storage_->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(), local_storage_->get_cname()); - local_storage_->extension()->decr_used_size(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_); @@ -238,49 +333,87 @@ int File::unlink() 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->get_host(); + 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'", 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(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->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; + 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->get_host(); - } 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->get_host()->get_cname()); - std::vector m_host_list = {src_host, dst_host}; - std::vector flops_amount = {0, 0}; - std::vector bytes_amount = {0, static_cast(read_size), 0, 0}; - - this_actor::parallel_execute(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->local_storage_->write(read_size); - fd->local_storage_->extension()->incr_used_size(write_size); - (*(fd->local_storage_->extension()->get_content()))[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; } @@ -292,12 +425,48 @@ int File::remote_move(sg_host_t host, const char* fullpath) 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_.reset(parse_content(ptr->get_impl()->content_name_)); size_ = ptr->get_impl()->size_; } +std::map* FileSystemDiskExt::parse_content(const std::string& filename) +{ + 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::parse_content(const std::string& filename) { if (filename.empty()) @@ -327,9 +496,14 @@ std::map* FileSystemStorageExt::parse_content(const std: } } -using simgrid::s4u::FileSystemStorageExt; using simgrid::s4u::FileDescriptorHostExt; +using simgrid::s4u::FileSystemDiskExt; +using simgrid::s4u::FileSystemStorageExt; +static void on_disk_creation(simgrid::s4u::Disk& d) +{ + d.extension_set(new FileSystemDiskExt(&d)); +} static void on_storage_creation(simgrid::s4u::Storage& st) { st.extension_set(new FileSystemStorageExt(&st)); @@ -352,6 +526,11 @@ void sg_storage_file_system_init() 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::on_creation.connect(&on_host_creation); @@ -459,6 +638,21 @@ int sg_file_rmove(sg_file_t file, sg_host_t host, const char* 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()->get_size() - st->extension()->get_used_size();