X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2b455e834089e4512c6311872052ba441b487ec..04d3d36e9e87d194bee4f88859f96d66975cce31:/src/msg/msg_io.cpp diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp index 1913d3bde3..31c6ca082f 100644 --- a/src/msg/msg_io.cpp +++ b/src/msg/msg_io.cpp @@ -3,15 +3,15 @@ /* 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/File.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" +#include "src/plugins/file_system/FileSystem.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)"); -SG_BEGIN_DECL() +extern "C" { /** @addtogroup msg_file * (#msg_file_t) and the functions for managing it. @@ -19,63 +19,6 @@ SG_BEGIN_DECL() * \see #msg_file_t */ -static int MSG_host_get_file_descriptor_id(msg_host_t host) -{ - simgrid::MsgHostExt* priv = host->extension(); - if (priv->file_descriptor_table == nullptr) { - priv->file_descriptor_table = new std::vector(sg_storage_max_file_descriptors); - std::iota(priv->file_descriptor_table->rbegin(), priv->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0. - } - xbt_assert(not priv->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed."); - int desc = priv->file_descriptor_table->back(); - priv->file_descriptor_table->pop_back(); - return desc; -} - -static void MSG_host_release_file_descriptor_id(msg_host_t host, int id) -{ - host->extension()->file_descriptor_table->push_back(id); -} - -/** \ingroup msg_file - * - * \brief Set the user data of a #msg_file_t. - * - * This functions attach \a data to \a file. - */ -msg_error_t MSG_file_set_data(msg_file_t fd, void *data) -{ - fd->setUserdata(data); - return MSG_OK; -} - -/** \ingroup msg_file - * - * \brief Return the user data of a #msg_file_t. - * - * This functions checks whether \a file is a valid pointer and return the user data associated to \a file if possible. - */ -void* MSG_file_get_data(msg_file_t fd) -{ - return fd->getUserdata(); -} - -/** \ingroup msg_file - * \brief Display information related to a file descriptor - * - * \param fd is a the file descriptor - */ -void MSG_file_dump (msg_file_t fd){ - 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", - fd->getPath(), fd->size(), fd->mount_point.c_str(), fd->storageId, fd->storage_type, fd->desc_id); -} - /** \ingroup msg_file * \brief Read a file (local or remote) * @@ -91,9 +34,9 @@ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size) return 0; /* Find the host where the file is physically located and read it */ - msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId); + msg_storage_t storage_src = fd->localStorage; msg_host_t attached_host = storage_src->getHost(); - read_size = fd->read(size); // TODO re-add attached_host + 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 */ @@ -132,7 +75,7 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size) return 0; /* Find the host where the file is physically located (remote or local)*/ - msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId); + msg_storage_t storage_src = fd->localStorage; msg_host_t attached_host = storage_src->getHost(); if (strcmp(attached_host->getCname(), MSG_host_self()->getCname())) { @@ -157,112 +100,11 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size) } } /* Write file on local or remote host */ - // sg_size_t offset = fd->tell(); - sg_size_t write_size = fd->write(size); // TODO readd attached_host + sg_size_t write_size = fd->write(size); return write_size; } -/** \ingroup msg_file - * \brief Opens the file whose name is the string pointed to by path - * - * \param fullpath is the file location on the storage - * \param data user data to attach to the file - * - * \return An #msg_file_t associated to the file - */ -msg_file_t MSG_file_open(const char* fullpath, void* data) -{ - msg_file_t fd = new simgrid::s4u::File(fullpath, MSG_host_self()); - fd->desc_id = MSG_host_get_file_descriptor_id(MSG_host_self()); - return fd; -} - -/** \ingroup msg_file - * \brief Close the file - * - * \param fd is the file to close - * \return 0 on success or 1 on error - */ -int MSG_file_close(msg_file_t fd) -{ - MSG_host_release_file_descriptor_id(MSG_host_self(), fd->desc_id); - delete fd; - - return MSG_OK; -} - -/** \ingroup msg_file - * \brief Unlink the file pointed by fd - * - * \param fd is the file descriptor (#msg_file_t) - * \return 0 on success or 1 on error - */ -msg_error_t MSG_file_unlink(msg_file_t fd) -{ - fd->unlink(); - delete fd; - return MSG_OK; -} - -/** \ingroup msg_file - * \brief Return the size of a file - * - * \param fd is the file descriptor (#msg_file_t) - * \return the size of the file (as a #sg_size_t) - */ -sg_size_t MSG_file_get_size(msg_file_t fd) -{ - return fd->size(); -} - -/** - * \ingroup msg_file - * \brief Set the file position indicator in the msg_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 - * 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) - * \return If successful, the function returns MSG_OK (=0). Otherwise, it returns MSG_TASK_CANCELED (=8). - */ -msg_error_t MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin) -{ - fd->seek(offset, origin); - return MSG_OK; -} - -/** - * \ingroup msg_file - * \brief Returns the current value of the position indicator of the file - * - * \param fd : file object that identifies the stream - * \return On success, the current value of the position indicator is returned. - * - */ -sg_size_t MSG_file_tell(msg_file_t fd) -{ - return fd->tell(); -} - -const char *MSG_file_get_name(msg_file_t fd) { - xbt_assert((fd != nullptr), "Invalid parameters"); - return fd->getPath(); -} - -/** - * \ingroup msg_file - * \brief Move a file to another location on the *same mount point*. - * - */ -msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath) -{ - fd->move(fullpath); - return MSG_OK; -} - /** * \ingroup msg_file * \brief Copy a file to another location on a remote host. @@ -274,9 +116,9 @@ msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath) 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 = simgrid::s4u::Storage::byName(file->storageId); + msg_storage_t storage_src = file->localStorage; msg_host_t src_host = storage_src->getHost(); - MSG_file_seek(file, 0, SEEK_SET); + 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 */ @@ -284,7 +126,7 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa msg_host_t dst_host; size_t longest_prefix_length = 0; - for (auto elm : host->getMountedStorages()) { + 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*/ @@ -339,7 +181,7 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa 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); - MSG_file_unlink(file); + file->unlink(); return res; } @@ -357,27 +199,13 @@ msg_error_t MSG_file_rmove (msg_file_t file, msg_host_t host, const char* fullpa const char* MSG_storage_get_name(msg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getName(); -} - -/** \ingroup msg_storage_management - * \brief Returns the free space size of a storage element - * \param storage a storage - * \return the free space size of the storage element (as a #sg_size_t) - */ -sg_size_t MSG_storage_get_free_size(msg_storage_t storage) -{ - return storage->getSizeFree(); + return storage->getCname(); } -/** \ingroup msg_storage_management - * \brief Returns the used space size of a storage element - * \param storage a storage - * \return the used space size of the storage element (as a #sg_size_t) - */ -sg_size_t MSG_storage_get_used_size(msg_storage_t storage) +const char* MSG_storage_get_host(msg_storage_t storage) { - return storage->getSizeUsed(); + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->getHost()->getCname(); } /** \ingroup msg_storage_management @@ -388,7 +216,14 @@ sg_size_t MSG_storage_get_used_size(msg_storage_t storage) xbt_dict_t MSG_storage_get_properties(msg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)"); - return storage->getProperties(); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + std::map* props = storage->getProperties(); + if (props == nullptr) + return nullptr; + for (auto const& elm : *props) { + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + } + return as_dict; } /** \ingroup msg_storage_management @@ -432,75 +267,32 @@ xbt_dynar_t MSG_storages_as_dynar() { std::map* storage_map = simgrid::s4u::allStorages(); xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),nullptr); - for (auto s : *storage_map) + for (auto const& s : *storage_map) xbt_dynar_push(res, &(s.second)); delete storage_map; return res; } -/** \ingroup msg_storage_management - * - * \brief Set the user data of a #msg_storage_t. - * This functions attach \a data to \a storage if possible. - */ -msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) -{ - storage->setUserdata(data); - return MSG_OK; -} - -/** \ingroup m_host_management - * - * \brief Returns the user data of a #msg_storage_t. - * - * This functions checks whether \a storage is a valid pointer and returns its associate user data if possible. - */ -void *MSG_storage_get_data(msg_storage_t storage) +void* MSG_storage_get_data(msg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); return storage->getUserdata(); } -/** \ingroup msg_storage_management - * - * \brief Returns the content (file list) of a #msg_storage_t. - * \param storage a storage - * \return The content of this storage element as a dict (full path file => size) - */ -xbt_dict_t MSG_storage_get_content(msg_storage_t storage) +msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) { - std::map* content = storage->getContent(); - xbt_dict_t content_dict = xbt_dict_new_homogeneous(&free); - - for (auto entry : *content) { - sg_size_t* psize = static_cast(malloc(sizeof(sg_size_t))); - *psize = entry.second; - xbt_dict_set(content_dict, entry.first.c_str(), psize, nullptr); - } - return content_dict; + storage->setUserdata(data); + return MSG_OK; } -/** \ingroup msg_storage_management - * - * \brief Returns the size of a #msg_storage_t. - * \param storage a storage - * \return The size of the storage - */ -sg_size_t MSG_storage_get_size(msg_storage_t storage) +sg_size_t MSG_storage_read(msg_storage_t storage, sg_size_t size) { - return storage->getSize(); + return storage->read(size); } -/** \ingroup msg_storage_management - * - * \brief Returns the host name the storage is attached to - * - * This functions checks whether a storage is a valid pointer or not and return its name. - */ -const char* MSG_storage_get_host(msg_storage_t storage) +sg_size_t MSG_storage_write(msg_storage_t storage, sg_size_t size) { - xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getHost()->getCname(); + return storage->write(size); } -SG_END_DECL() +}