PLUGINS:
- New link_energy plugin for the consumption of the links.
- - Most of the operations on files and storage contents have been
+ - All of the operations on files and storage contents have been
packaged into a plugin (src/plugins/file_system). The current
public interface can be found in
include/simgrid/plugins/file_system.h
return res;
}
-/************************** File handling ***********************************/
-XBT_PUBLIC(sg_size_t) MSG_file_read(msg_file_t fd, sg_size_t size);
-XBT_PUBLIC(sg_size_t) MSG_file_write(msg_file_t fd, sg_size_t size);
-XBT_PUBLIC(msg_error_t) MSG_file_rcopy(msg_file_t fd, msg_host_t host, const char* fullpath);
-XBT_PUBLIC(msg_error_t) MSG_file_rmove(msg_file_t fd, msg_host_t host, const char* fullpath);
/************************** Storage handling ***********************************/
XBT_PUBLIC(const char *) MSG_storage_get_name(msg_storage_t storage);
XBT_PUBLIC(msg_storage_t) MSG_storage_get_by_name(const char *name);
XBT_PUBLIC(void) sg_storage_file_system_init();
XBT_PUBLIC(sg_file_t) sg_file_open(const char* fullpath, void* data);
+XBT_PUBLIC(sg_size_t) sg_file_read(sg_file_t fd, sg_size_t size);
+XBT_PUBLIC(sg_size_t) sg_file_write(sg_file_t fd, sg_size_t size);
XBT_PUBLIC(void) sg_file_close(sg_file_t fd);
XBT_PUBLIC(const char*) sg_file_get_name(sg_file_t fd);
XBT_PUBLIC(sg_size_t) sg_file_tell(sg_file_t fd);
XBT_PUBLIC(void) sg_file_move(sg_file_t fd, const char* fullpath);
XBT_PUBLIC(void) sg_file_unlink(sg_file_t fd);
+XBT_PUBLIC(int) sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath);
+XBT_PUBLIC(int) sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath);
XBT_PUBLIC(void*) sg_storage_get_data(sg_storage_t storage);
XBT_PUBLIC(void) sg_storage_set_data(sg_storage_t storage, void* data);
XBT_PUBLIC(xbt_dict_t) sg_host_get_storage_content(sg_host_t host);
#define MSG_file_open(fullpath, data) sg_file_open(fullpath, data)
+#define MSG_file_read(fd, size) sg_file_read(fd, size)
+#define MSG_file_write(fd, size) sg_file_write(fd, size)
#define MSG_file_close(fd) sg_file_close(fd)
#define MSG_file_get_name(fd) sg_file_get_name(fd)
#define MSG_file_get_size(fd) sg_file_get_size(fd)
#define MSG_file_tell(fd) sg_file_tell(fd)
#define MSG_file_move(fd, fullpath) sg_file_get_size(fd, fullpath)
#define MSG_file_unlink(fd) sg_file_unlink(fd)
+#define MSG_file_rcopy(file, host, fullpath) sg_file_rcopy(file, host, fullpath)
+#define MSG_file_rmove(file, host, fullpath) sg_file_rmove(file, host, fullpath)
#define MSG_storage_file_system_init() sg_storage_file_system_init()
#define MSG_storage_get_free_size(st) sg_storage_get_size_free(st)
/* 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 "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "src/msg/msg_private.hpp"
extern "C" {
-/** @addtogroup msg_file
- * (#msg_file_t) and the functions for managing it.
- *
- * \see #msg_file_t
- */
-
-/** \ingroup msg_file
- * \brief Read a file (local or remote)
- *
- * \param size of the file to read
- * \param fd is a the file descriptor
- * \return the number of bytes successfully read or -1 if an error occurred
- */
-sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
-{
- sg_size_t read_size;
-
- if (fd->size() == 0) /* Nothing to read, return */
- return 0;
-
- /* Find the host where the file is physically located and read it */
- msg_storage_t storage_src = fd->localStorage;
- msg_host_t attached_host = storage_src->getHost();
- read_size = fd->read(size);
-
- if (strcmp(attached_host->getCname(), MSG_host_self()->getCname())) {
- /* 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.", attached_host->getCname(), read_size);
- msg_host_t m_host_list[] = {MSG_host_self(), attached_host};
- double flops_amount[] = {0, 0};
- double bytes_amount[] = {0, 0, static_cast<double>(read_size), 0};
-
- msg_task_t task = MSG_parallel_task_create("file transfer for read", 2, m_host_list, flops_amount, bytes_amount,
- nullptr);
- msg_error_t transfer = MSG_parallel_task_execute(task);
- MSG_task_destroy(task);
-
- if(transfer != MSG_OK){
- if (transfer == MSG_HOST_FAILURE)
- XBT_WARN("Transfer error, %s remote host just turned off!", attached_host->getCname());
- if (transfer == MSG_TASK_CANCELED)
- XBT_WARN("Transfer error, task has been canceled!");
-
- return -1;
- }
- }
- return read_size;
-}
-
-/** \ingroup msg_file
- * \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 MSG_file_write(msg_file_t fd, sg_size_t size)
-{
- if (size == 0) /* Nothing to write, return */
- return 0;
-
- /* Find the host where the file is physically located (remote or local)*/
- msg_storage_t storage_src = fd->localStorage;
- msg_host_t attached_host = storage_src->getHost();
-
- if (strcmp(attached_host->getCname(), MSG_host_self()->getCname())) {
- /* 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.", attached_host->getCname(), size);
- msg_host_t m_host_list[] = {MSG_host_self(), attached_host};
- double flops_amount[] = {0, 0};
- double bytes_amount[] = {0, static_cast<double>(size), 0, 0};
-
- msg_task_t task = MSG_parallel_task_create("file transfer for write", 2, m_host_list, flops_amount, bytes_amount,
- nullptr);
- msg_error_t transfer = MSG_parallel_task_execute(task);
- MSG_task_destroy(task);
-
- if(transfer != MSG_OK){
- if (transfer == MSG_HOST_FAILURE)
- XBT_WARN("Transfer error, %s remote host just turned off!", attached_host->getCname());
- if (transfer == MSG_TASK_CANCELED)
- XBT_WARN("Transfer error, task has been canceled!");
-
- return -1;
- }
- }
- /* Write file on local or remote host */
- sg_size_t write_size = fd->write(size);
-
- return write_size;
-}
-
-/**
- * \ingroup msg_file
- * \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 MSG_OK. Otherwise, it returns MSG_TASK_CANCELED.
- */
-msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpath)
-{
- /* Find the host where the file is physically located and read it */
- msg_storage_t storage_src = file->localStorage;
- msg_host_t src_host = storage_src->getHost();
- file->seek(0, SEEK_SET);
- sg_size_t read_size = file->read(file->size());
-
- /* Find the host that owns the storage where the file has to be copied */
- msg_storage_t storage_dest = nullptr;
- msg_host_t 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;
- }
- }
-
- 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->getCname());
- return MSG_TASK_CANCELED;
- }
-
- XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, src_host->getCname(),
- storage_dest->getHost()->getCname());
- msg_host_t 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};
-
- simgrid::s4u::this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount);
-
- /* Create file on remote host, write it and close it */
- msg_file_t fd = new simgrid::s4u::File(fullpath, dst_host, nullptr);
- fd->write(read_size);
- delete fd;
- return MSG_OK;
-}
-
-/**
- * \ingroup msg_file
- * \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 MSG_OK. Otherwise, it returns MSG_TASK_CANCELED.
- */
-msg_error_t MSG_file_rmove (msg_file_t file, msg_host_t host, const char* fullpath)
-{
- msg_error_t res = MSG_file_rcopy(file, host, fullpath);
- file->unlink();
- return res;
-}
-
/********************************* Storage **************************************/
/** @addtogroup msg_storage_management
* (#msg_storage_t) and the functions for managing it.
/** Rename a file. WARNING: It is forbidden to move the file to another mount point */
void move(std::string fullpath);
+ int remoteCopy(sg_host_t host, const char* fullpath);
+ int remoteMove(sg_host_t host, const char* fullpath);
int unlink(); /** Remove a file from the contents of a disk */
void dump();
#include "xbt/log.h"
+#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
sg_size_t File::read(sg_size_t size)
{
+ if (size_ == 0) /* Nothing to read, return */
+ return 0;
+
+ /* 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());
// 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())) {
+ /* 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);
+ 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)
{
+ 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->getCname(), Host::current()->getCname())) {
+ /* 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);
+ 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->getCname(), size, size_);
// If the storage is full before even starting to write
if (sg_storage_get_size_used(localStorage) >= sg_storage_get_size(localStorage))
}
}
+int File::remoteCopy(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();
+ seek(0, SEEK_SET);
+ XBT_DEBUG("READ %s on disk '%s'", getPath(), localStorage->getCname());
+ // 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;
+ 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;
+ }
+ }
+
+ 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->getCname());
+ return -1;
+ }
+
+ XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, src_host->getCname(),
+ storage_dest->getHost()->getCname());
+ 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};
+
+ this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount);
+
+ /* 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<FileSystemStorageExt>()->incrUsedSize(write_size);
+ (*(fd->localStorage->extension<FileSystemStorageExt>()->getContent()))[path_] = size_;
+ delete fd;
+ return 0;
+}
+
+int File::remoteMove(sg_host_t host, const char* fullpath)
+{
+ int res = remoteCopy(host, fullpath);
+ unlink();
+ return res;
+}
+
FileSystemStorageExt::FileSystemStorageExt(simgrid::s4u::Storage* ptr)
{
content_ = parseContent(ptr->getImpl()->content_name);
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;
delete 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.
+ */
+int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath)
+{
+ return file->remoteCopy(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.
+ */
+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 st->extension<FileSystemStorageExt>()->getSize() - st->extension<FileSystemStorageExt>()->getUsedSize();
