X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7c6662f2627dddac82f15cb8d4f1b42ac23e2b9..c4f0716bba4bda0483e7a7c141417ace93d3c180:/src/s4u/s4u_Storage.cpp diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp index 6080b06cbd..84319d81a6 100644 --- a/src/s4u/s4u_Storage.cpp +++ b/src/s4u/s4u_Storage.cpp @@ -9,9 +9,6 @@ #include "simgrid/storage.h" #include "src/surf/StorageImpl.hpp" -#include -#include - namespace simgrid { namespace xbt { template class Extendable; @@ -19,55 +16,43 @@ template class Extendable; namespace s4u { -void getStorageList(std::map* whereTo) -{ - for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) - whereTo->insert({s->get_name(), s}); -} +simgrid::xbt::signal Storage::on_creation; +simgrid::xbt::signal Storage::on_destruction; +simgrid::xbt::signal Storage::on_state_change; Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name) { simgrid::s4u::Engine::get_instance()->storage_register(name, this); } -Storage* Storage::byName(std::string name) -{ - return Engine::get_instance()->storage_by_name_or_null(name); -} - -const std::string& Storage::get_name() const +Storage* Storage::by_name(std::string name) { - return name_; + return Engine::get_instance()->storage_by_name(name); } -const char* Storage::get_cname() const +Storage* Storage::by_name_or_null(std::string name) { - return name_.c_str(); + return Engine::get_instance()->storage_by_name_or_null(name); } -const char* Storage::getType() +const char* Storage::get_type() { return pimpl_->typeId_.c_str(); } -Host* Storage::getHost() +std::unordered_map* Storage::get_properties() { - return attached_to_; + return simgrid::simix::simcall([this] { return pimpl_->get_properties(); }); } -std::map* Storage::getProperties() +const char* Storage::get_property(std::string key) { - return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); }); + return this->pimpl_->get_property(key); } -const char* Storage::getProperty(std::string key) +void Storage::set_property(std::string key, std::string value) { - return this->pimpl_->getProperty(key); -} - -void Storage::setProperty(std::string key, std::string value) -{ - simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }); + simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); }); } sg_size_t Storage::read(sg_size_t size) @@ -80,11 +65,12 @@ sg_size_t Storage::write(sg_size_t size) return simcall_storage_write(pimpl_, size); } -/************* - * Callbacks * - *************/ -simgrid::xbt::signal Storage::onCreation; -simgrid::xbt::signal Storage::onDestruction; +// Deprecated functions +void getStorageList(std::map* whereTo) +{ + for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) + whereTo->insert({s->get_name(), s}); +} } /* namespace s4u */ } /* namespace simgrid */ @@ -95,9 +81,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. */ @@ -110,19 +96,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) { @@ -131,42 +117,42 @@ 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() { @@ -180,12 +166,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)