-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2018. 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/plugins/file_system/FileSystem.hpp"
#include "src/surf/HostImpl.hpp"
+#include "xbt/config.hpp"
#include <algorithm>
#include <boost/algorithm/string.hpp>
// 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());
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;
"\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)
{
+ if (size_ == 0) /* Nothing to read, return */
+ return 0;
- XBT_DEBUG("READ %s on disk '%s'", getPath(), localStorage->getCname());
+ /* 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<double>(read_size), 0};
+
+ this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount);
+ }
+
return read_size;
}
+/** \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
+ */
sg_size_t File::write(sg_size_t size)
{
- XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", getPath(), localStorage->getCname(), size, size_);
+ if (size == 0) /* Nothing to write, return */
+ return 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<double>(size), 0, 0};
+
+ this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount);
+ }
+
+ 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;
std::map<std::string, sg_size_t>* content = localStorage->extension<FileSystemStorageExt>()->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<FileSystemStorageExt>()->decrUsedSize(size_);
// Remove the file from storage
Storage* storage_src = localStorage;
Host* src_host = storage_src->getHost();
seek(0, SEEK_SET);
- sg_size_t read_size = read(size_);
+ 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;
/* Find the host that owns the storage where the file has to be copied */
Storage* 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->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());
- sg_host_t m_host_list[] = {src_host, dst_host};
+ 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<double>(read_size), 0, 0};
/* Create file on remote host, write it and close it */
File* fd = new File(fullpath, dst_host, nullptr);
- fd->write(read_size);
+ sg_size_t write_size = fd->localStorage->write(read_size);
+ fd->localStorage->extension<FileSystemStorageExt>()->incrUsedSize(write_size);
+ (*(fd->localStorage->extension<FileSystemStorageExt>()->getContent()))[path_] = size_;
delete fd;
return 0;
}
}
/* **************************** Public interface *************************** */
-SG_BEGIN_DECL()
-
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<FileSystemStorageExt>();
simgrid::s4u::Storage::onCreation.connect(&onStorageCreation);
return new simgrid::s4u::File(fullpath, data);
}
+sg_size_t sg_file_read(sg_file_t fd, sg_size_t size)
+{
+ return fd->read(size);
+}
+
+sg_size_t sg_file_write(sg_file_t fd, sg_size_t size)
+{
+ return fd->write(size);
+}
+
void sg_file_close(sg_file_t fd)
{
delete fd;
}
/**
- * \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
int sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath)
{
return file->remoteMove(host, fullpath);
- ;
}
sg_size_t sg_storage_get_size_free(sg_storage_t st)
return contents;
}
-
-SG_END_DECL()
