X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2212826ed1d2df61b17e5984660e19288247063f..f0a8a2d708e0a6a1cffac49fbc83d451fe8203a8:/src/s4u/s4u_Storage.cpp

diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp
index a4e08df8fc..f0bd686d3e 100644
--- a/src/s4u/s4u_Storage.cpp
+++ b/src/s4u/s4u_Storage.cpp
@@ -1,17 +1,15 @@
-/* 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 <string>
-#include <unordered_map>
-
 namespace simgrid {
 namespace xbt {
 template class Extendable<simgrid::s4u::Storage>;
@@ -19,74 +17,78 @@ template class Extendable<simgrid::s4u::Storage>;
 
 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<std::string, Storage*>* whereTo)
-{
-  for (auto const& s : simgrid::s4u::Engine::getInstance()->get_all_storages())
-    whereTo->insert({s->get_name(), s});
-}
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_creation;
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_destruction;
+simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_state_change;
 
 Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
 {
-  simgrid::s4u::Engine::getInstance()->storage_register(name, this);
+  simgrid::s4u::Engine::get_instance()->storage_register(name, this);
 }
 
-Storage* Storage::byName(std::string name)
+Storage* Storage::by_name(std::string name)
 {
-  return Engine::getInstance()->storage_by_name_or_null(name);
+  return Engine::get_instance()->storage_by_name(name);
 }
 
-const std::string& Storage::get_name() const
+Storage* Storage::by_name_or_null(std::string name)
 {
-  return name_;
+  return Engine::get_instance()->storage_by_name_or_null(name);
 }
 
-const char* Storage::get_cname() const
+const char* Storage::get_type()
 {
-  return name_.c_str();
+  return pimpl_->typeId_.c_str();
 }
 
-const char* Storage::getType()
+std::unordered_map<std::string, std::string>* Storage::get_properties()
 {
-  return pimpl_->typeId_.c_str();
+  return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
 }
 
-Host* Storage::getHost()
+const char* Storage::get_property(std::string key)
 {
-  return attached_to_;
+  return this->pimpl_->get_property(key);
 }
 
-std::map<std::string, std::string>* Storage::getProperties()
+void Storage::set_property(std::string key, std::string value)
 {
-  return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); });
+  simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
 }
 
-const char* Storage::getProperty(std::string key)
+IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
 {
-  return this->pimpl_->getProperty(key);
+  return IoPtr(new Io(this, size, type));
 }
 
-void Storage::setProperty(std::string key, std::string value)
+IoPtr Storage::read_async(sg_size_t size)
 {
-  simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
+  IoPtr res = io_init(size, Io::OpType::READ);
+  res->start();
+  return res;
 }
 
 sg_size_t Storage::read(sg_size_t size)
 {
-  return simcall_storage_read(pimpl_, size);
+  IoPtr i = io_init(size, Io::OpType::READ);
+  i->start()->wait();
+  return i->get_performed_ioops();
 }
 
-sg_size_t Storage::write(sg_size_t size)
+IoPtr Storage::write_async(sg_size_t size)
 {
-  return simcall_storage_write(pimpl_, size);
+
+  IoPtr res = io_init(size, Io::OpType::WRITE);
+  res->start();
+  return res;
 }
 
-/*************
- * Callbacks *
- *************/
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onCreation;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
+sg_size_t Storage::write(sg_size_t size)
+{
+  IoPtr i = io_init(size, Io::OpType::WRITE);
+  i->start()->wait();
+  return i->get_performed_ioops();
+}
 
 } /* namespace s4u */
 } /* namespace simgrid */
@@ -97,9 +99,9 @@ simgrid::xbt::signal<void(s4u::Storage&)> 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 +114,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<std::string, std::string>* props = storage->getProperties();
+  std::unordered_map<std::string, std::string>* props = storage->get_properties();
   if (props == nullptr)
     return nullptr;
   for (auto const& elm : *props) {
@@ -133,46 +135,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<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::getInstance()->get_all_storages();
+  std::vector<simgrid::s4u::Storage*> 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 +184,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)