X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07e23d67fa051a2507972338c09151e69c1ad2d4..173b3916e2bf66ae93d66d3a07ad9974610ac7ce:/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 9200d1a2f3..b1b6bafc55 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -3,13 +3,9 @@ /* 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 @@ -34,7 +30,7 @@ File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(ful // 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->getCname()); + 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()); @@ -50,7 +46,7 @@ File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(ful 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->getCname()); + xbt_die("Can't find mount point for '%s' on '%s'", fullpath.c_str(), host->get_cname()); localStorage = st; @@ -91,7 +87,7 @@ void File::dump() "\t\tStorage Id: '%s'\n" "\t\tStorage Type: '%s'\n" "\t\tFile Descriptor Id: %d", - getPath(), size_, mount_point_.c_str(), localStorage->getCname(), localStorage->getType(), desc_id); + getPath(), size_, mount_point_.c_str(), localStorage->get_cname(), localStorage->getType(), desc_id); } sg_size_t File::read(sg_size_t size) @@ -101,14 +97,14 @@ sg_size_t File::read(sg_size_t 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->getCname()); + 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->getCname(), Host::current()->getCname())) { + 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->getCname(), read_size); + 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}; @@ -133,9 +129,9 @@ sg_size_t File::write(sg_size_t size) /* Find the host where the file is physically located (remote or local)*/ Host* host = localStorage->getHost(); - if (strcmp(host->getCname(), Host::current()->getCname())) { + 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->getCname(), size); + 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}; @@ -143,7 +139,7 @@ sg_size_t File::write(sg_size_t size) this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); } - XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", getPath(), localStorage->getCname(), size, size_); + 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; @@ -221,10 +217,10 @@ int File::unlink() std::map* content = localStorage->extension()->getContent(); if (content->find(path_) == content->end()) { - XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), localStorage->getCname()); + XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), localStorage->get_cname()); return -1; } else { - XBT_DEBUG("UNLINK %s on disk '%s'", path_.c_str(), localStorage->getCname()); + XBT_DEBUG("UNLINK %s on disk '%s'", path_.c_str(), localStorage->get_cname()); localStorage->extension()->decrUsedSize(size_); // Remove the file from storage @@ -240,7 +236,7 @@ int File::remoteCopy(sg_host_t host, const char* fullpath) Storage* storage_src = localStorage; Host* src_host = storage_src->getHost(); seek(0, SEEK_SET); - XBT_DEBUG("READ %s on disk '%s'", getPath(), localStorage->getCname()); + 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_); current_position_ += read_size; @@ -263,12 +259,12 @@ int File::remoteCopy(sg_host_t host, const char* fullpath) /* 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->getCname()); + 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->getCname(), - storage_dest->getHost()->getCname()); + 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}; @@ -350,8 +346,6 @@ static void onHostCreation(simgrid::s4u::Host& host) } /* **************************** Public interface *************************** */ -SG_BEGIN_DECL() - void sg_storage_file_system_init() { if (not FileSystemStorageExt::EXTENSION_ID.valid()) { @@ -505,5 +499,3 @@ xbt_dict_t sg_host_get_storage_content(sg_host_t host) return contents; } - -SG_END_DECL()