X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aee6610d4ad2377964369760bce27e18a12dd708..fbf5fafb60eb44c0c00a7283fd05a6dec5f2b58f:/src/s4u/s4u_Storage.cpp diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp index 4179d0cf87..cabbcb0429 100644 --- a/src/s4u/s4u_Storage.cpp +++ b/src/s4u/s4u_Storage.cpp @@ -1,95 +1,89 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Io.hpp" #include "simgrid/s4u/Storage.hpp" #include "simgrid/storage.h" #include "src/surf/StorageImpl.hpp" -#include -#include - namespace simgrid { namespace xbt { -template class Extendable; -} +template class Extendable; +} // namespace xbt namespace s4u { -void XBT_ATTRIB_DEPRECATED_v322( - "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22") - getStorageList(std::map* whereTo) +xbt::signal Storage::on_creation; +xbt::signal Storage::on_destruction; +xbt::signal Storage::on_state_change; + +Storage::Storage(const std::string& name, kernel::resource::StorageImpl* pimpl) : pimpl_(pimpl), name_(name) { - for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) - whereTo->insert({s->get_name(), s}); + Engine::get_instance()->storage_register(name_, this); } -Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name) +Storage* Storage::by_name(const std::string& name) { - simgrid::s4u::Engine::getInstance()->addStorage(name, this); + return Engine::get_instance()->storage_by_name(name); } -Storage* Storage::byName(std::string name) +Storage* Storage::by_name_or_null(const std::string& name) { - return Engine::getInstance()->storageByNameOrNull(name); + return Engine::get_instance()->storage_by_name_or_null(name); } -const std::string& Storage::get_name() const +const char* Storage::get_type() { - return name_; + return pimpl_->typeId_.c_str(); } -const char* Storage::get_cname() const +std::unordered_map* Storage::get_properties() { - return name_.c_str(); + return simix::simcall([this] { return pimpl_->get_properties(); }); } -const char* Storage::getType() +const char* Storage::get_property(const std::string& key) { - return pimpl_->typeId_.c_str(); + return this->pimpl_->get_property(key); } -Host* Storage::getHost() +void Storage::set_property(const std::string& key, const std::string& value) { - return attached_to_; + simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); } -std::map* Storage::getProperties() +IoPtr Storage::io_init(sg_size_t size, Io::OpType type) { - return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); }); + return IoPtr(new Io(this, size, type)); } -const char* Storage::getProperty(std::string key) +IoPtr Storage::read_async(sg_size_t size) { - return this->pimpl_->getProperty(key); + return IoPtr(io_init(size, Io::OpType::READ))->start(); } -void Storage::setProperty(std::string key, std::string value) +sg_size_t Storage::read(sg_size_t size) { - simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }); + return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops(); } -sg_size_t Storage::read(sg_size_t size) +IoPtr Storage::write_async(sg_size_t size) { - return simcall_storage_read(pimpl_, size); + + return IoPtr(io_init(size, Io::OpType::WRITE)->start()); } sg_size_t Storage::write(sg_size_t size) { - return simcall_storage_write(pimpl_, size); + return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops(); } -/************* - * Callbacks * - *************/ -simgrid::xbt::signal Storage::onCreation; -simgrid::xbt::signal Storage::onDestruction; - -} /* namespace s4u */ -} /* namespace simgrid */ +} // namespace s4u +} // namespace simgrid /* **************************** Public C interface *************************** */ @@ -97,9 +91,9 @@ simgrid::xbt::signal Storage::onDestruction; * (#sg_storage_t) and the functions for managing it. */ -/** \ingroup sg_storage_management +/** @ingroup sg_storage_management * - * \brief Returns the name of the #sg_storage_t. + * @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. */ @@ -112,19 +106,19 @@ const char* sg_storage_get_name(sg_storage_t storage) const char* sg_storage_get_host(sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getHost()->get_cname(); + return storage->get_host()->get_cname(); } -/** \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 +/** @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) { 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(); + std::unordered_map* props = storage->get_properties(); if (props == nullptr) return nullptr; for (auto const& elm : *props) { @@ -133,46 +127,46 @@ xbt_dict_t sg_storage_get_properties(sg_storage_t storage) return as_dict; } -/** \ingroup sg_storage_management - * \brief Change the value of a given storage property +/** @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 + * @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) { - storage->setProperty(name, value); + storage->set_property(name, value); } -/** \ingroup sg_storage_management - * \brief Returns the value of a given storage property +/** @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) + * @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) { - return storage->getProperty(name); + return storage->get_property(name); } -/** \ingroup sg_storage_management - * \brief Finds a sg_storage_t using its name. - * \param name the name of a storage - * \return the corresponding storage +/** @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 simgrid::s4u::Storage::byName(name); + return simgrid::s4u::Storage::by_name(name); } -/** \ingroup sg_storage_management - * \brief Returns a dynar containing all the storage elements declared at a given point of time +/** @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() { - std::vector storage_list = simgrid::s4u::Engine::getInstance()->getAllStorages(); + std::vector storage_list = simgrid::s4u::Engine::get_instance()->get_all_storages(); xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr); for (auto const& s : storage_list) xbt_dynar_push(res, &s); @@ -182,12 +176,12 @@ xbt_dynar_t sg_storages_as_dynar() void* sg_storage_get_data(sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getUserdata(); + return storage->get_data(); } void sg_storage_set_data(sg_storage_t storage, void* data) { - storage->setUserdata(data); + storage->set_data(data); } sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size)