jedule: obey our coding standards

[simgrid.git] / src / s4u / s4u_Storage.cpp

diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp
index c26d4a5..3c54d86 100644 (file)
--- 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 <string>
-#include <unordered_map>
-
 namespace simgrid {
 namespace xbt {
 template class Extendable<simgrid::s4u::Storage>;
@@ -19,57 +16,43 @@ 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()->getAllStorages())
-    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()->add_storage(name, this);
-}
-
-Storage* Storage::byName(std::string name)
-{
-  return Engine::getInstance()->storage_by_name_or_null(name);
+  simgrid::s4u::Engine::get_instance()->storage_register(name, this);
 }
 
-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<std::string, std::string>* Storage::get_properties()
 {
-  return attached_to_;
+  return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
 }
 
-std::map<std::string, std::string>* 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)
@@ -82,11 +65,12 @@ sg_size_t Storage::write(sg_size_t size)
   return simcall_storage_write(pimpl_, size);
 }
 
-/*************
- * Callbacks *
- *************/
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onCreation;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
+// Deprecated functions
+void getStorageList(std::map<std::string, Storage*>* whereTo)
+{
+  for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
+    whereTo->insert({s->get_name(), s});
+}
 
 } /* namespace s4u */
 } /* namespace simgrid */
@@ -112,7 +96,7 @@ 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
@@ -124,7 +108,7 @@ 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) {
@@ -142,7 +126,7 @@ xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
  */
 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
@@ -154,7 +138,7 @@ void sg_storage_set_property_value(sg_storage_t storage, const char* name, const
  */
 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
@@ -164,7 +148,7 @@ const char* sg_storage_get_property_value(sg_storage_t storage, const char* name
  */
 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
@@ -172,7 +156,7 @@ sg_storage_t sg_storage_get_by_name(const char* name)
  */
 xbt_dynar_t sg_storages_as_dynar()
 {
-  std::vector<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::getInstance()->getAllStorages();
+  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 +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)