X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c4965d1ed8267a5693fc79f76b20c224a870ba1..a1d99197df9d450ddb365e5a2a4108cb75904f5f:/src/s4u/s4u_storage.cpp diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp index 9123343960..780d5c71a2 100644 --- a/src/s4u/s4u_storage.cpp +++ b/src/s4u/s4u_storage.cpp @@ -1,13 +1,15 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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 "simgrid/s4u/File.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "simgrid/simix.hpp" +#include "simgrid/storage.h" #include "src/surf/StorageImpl.hpp" + +#include #include namespace simgrid { @@ -17,32 +19,32 @@ template class Extendable; namespace s4u { -std::map* allStorages() +void XBT_ATTRIB_DEPRECATED_v322( + "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22") + getStorageList(std::map* whereTo) { - std::unordered_map* map = surf::StorageImpl::storagesMap(); - std::map* res = new std::map; - for (auto const& s : *map) - res->insert({s.first, &(s.second->piface_)}); // Convert each entry into its interface + for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) + whereTo->insert({s->get_name(), s}); +} - return res; +Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name) +{ + simgrid::s4u::Engine::getInstance()->addStorage(name, this); } Storage* Storage::byName(std::string name) { - surf::StorageImpl* res = surf::StorageImpl::byName(name); - if (res == nullptr) - return nullptr; - return &res->piface_; + return Engine::getInstance()->storageByNameOrNull(name); } -const std::string& Storage::getName() const +const std::string& Storage::get_name() const { - return pimpl_->getName(); + return name_; } -const char* Storage::getCname() const +const char* Storage::get_cname() const { - return pimpl_->getCname(); + return name_.c_str(); } const char* Storage::getType() @@ -55,72 +57,145 @@ Host* Storage::getHost() return attached_to_; } -sg_size_t Storage::getSizeFree() +std::map* Storage::getProperties() { - FileSystemStorageExt* file_system = extension(); + return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); }); +} - return pimpl_->getSize() - file_system->getUsedSize(); +const char* Storage::getProperty(std::string key) +{ + return this->pimpl_->getProperty(key); } -sg_size_t Storage::getSizeUsed() +void Storage::setProperty(std::string key, std::string value) { - FileSystemStorageExt* file_system = extension(); - return file_system->getUsedSize(); + simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }); } -void Storage::decrUsedSize(sg_size_t size) +sg_size_t Storage::read(sg_size_t size) { - FileSystemStorageExt* file_system = extension(); - file_system->decrUsedSize(size); + return simcall_storage_read(pimpl_, size); } -void Storage::incrUsedSize(sg_size_t size) +sg_size_t Storage::write(sg_size_t size) { - FileSystemStorageExt* file_system = extension(); - file_system->incrUsedSize(size); + return simcall_storage_write(pimpl_, size); } -sg_size_t Storage::getSize() +/************* + * Callbacks * + *************/ +simgrid::xbt::signal Storage::onCreation; +simgrid::xbt::signal Storage::onDestruction; + +} /* namespace s4u */ +} /* namespace simgrid */ + +/* **************************** Public C interface *************************** */ + +/** @addtogroup sg_storage_management + * (#sg_storage_t) and the functions for managing it. + */ + +/** \ingroup sg_storage_management + * + * \brief Returns the name of the #sg_storage_t. + * + * This functions checks whether a storage is a valid pointer or not and return its name. + */ +const char* sg_storage_get_name(sg_storage_t storage) { - return pimpl_->getSize(); + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->get_cname(); } -std::map* Storage::getProperties() +const char* sg_storage_get_host(sg_storage_t storage) { - return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); }); + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->getHost()->get_cname(); } -const char* Storage::getProperty(std::string key) +/** \ingroup sg_storage_management + * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage + * \param storage a storage + * \return a dict containing the properties + */ +xbt_dict_t sg_storage_get_properties(sg_storage_t storage) { - return this->pimpl_->getProperty(key); + xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)"); + 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; } -void Storage::setProperty(std::string key, std::string value) +/** \ingroup sg_storage_management + * \brief Change the value of a given storage property + * + * \param storage a storage + * \param name a property name + * \param value what to change the property to + */ +void sg_storage_set_property_value(sg_storage_t storage, const char* name, const char* value) { - simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }); + storage->setProperty(name, value); } -std::map* Storage::getContent() +/** \ingroup sg_storage_management + * \brief Returns the value of a given storage property + * + * \param storage a storage + * \param name a property name + * \return value of a property (or nullptr if property not set) + */ +const char* sg_storage_get_property_value(sg_storage_t storage, const char* name) { - FileSystemStorageExt* file_system = extension(); - return file_system->getContent(); + return storage->getProperty(name); } -sg_size_t Storage::read(sg_size_t size) +/** \ingroup sg_storage_management + * \brief Finds a sg_storage_t using its name. + * \param name the name of a storage + * \return the corresponding storage + */ +sg_storage_t sg_storage_get_by_name(const char* name) { - return simcall_storage_read(pimpl_, size); + return simgrid::s4u::Storage::byName(name); } -sg_size_t Storage::write(sg_size_t size) +/** \ingroup sg_storage_management + * \brief Returns a dynar containing all the storage elements declared at a given point of time + */ +xbt_dynar_t sg_storages_as_dynar() { - return simcall_storage_write(pimpl_, size); + std::vector storage_list = simgrid::s4u::Engine::getInstance()->getAllStorages(); + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr); + for (auto const& s : storage_list) + xbt_dynar_push(res, &s); + return res; } -/************* - * Callbacks * - *************/ -simgrid::xbt::signal Storage::onCreation; -simgrid::xbt::signal Storage::onDestruction; +void* sg_storage_get_data(sg_storage_t storage) +{ + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->getUserdata(); +} -} /* namespace s4u */ -} /* namespace simgrid */ +void sg_storage_set_data(sg_storage_t storage, void* data) +{ + storage->setUserdata(data); +} + +sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size) +{ + return storage->read(size); +} + +sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size) +{ + return storage->write(size); +}