inline SIMIX_host_off into s4u::Host->turnOff()

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

diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp
index 2e5d37d..a0e7699 100644 (file)
--- a/src/s4u/s4u_Storage.cpp
+++ b/src/s4u/s4u_Storage.cpp
@@ -19,9 +19,7 @@ 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)
+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});
@@ -59,7 +57,7 @@ Host* Storage::getHost()
 
 std::map<std::string, std::string>* Storage::getProperties()
 {
-  return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); });
+  return simgrid::simix::simcall([this] { return pimpl_->getProperties(); });
 }
 
 const char* Storage::getProperty(std::string key)
@@ -69,7 +67,7 @@ const char* Storage::getProperty(std::string 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_->setProperty(key, value); });
 }
 
 sg_size_t Storage::read(sg_size_t size)
@@ -85,8 +83,9 @@ sg_size_t Storage::write(sg_size_t size)
 /*************
  * Callbacks *
  *************/
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onCreation;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
+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;
 
 } /* namespace s4u */
 } /* namespace simgrid */