X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d17c885aa26ea6c36c1fc0c6ab39ddd5d509755..fe06d3ceaa02056b708bb777ed9973df6744f776:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 53b75032e7..6a1f0db720 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -19,13 +19,13 @@ extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
 
 void check_disk_attachment()
 {
-  for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
-    simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
+  for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) {
+    simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->get_impl()->getHost().c_str());
     if (not host_elm)
       surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
-                       s->getImpl()->getHost().c_str() + " does not exist.");
+                       s->get_impl()->getHost().c_str() + " does not exist.");
     else
-      s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
+      s->set_host(sg_host_by_name(s->get_impl()->getHost().c_str()));
   }
 }
 
@@ -36,12 +36,16 @@ void check_disk_attachment()
 void surf_storage_model_init_default()
 {
   surf_storage_model = new simgrid::surf::StorageN11Model();
-  all_existing_models->push_back(surf_storage_model);
 }
 
 namespace simgrid {
 namespace surf {
 
+StorageN11Model::StorageN11Model()
+{
+  all_existing_models.push_back(this);
+}
+
 StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name,
                                             std::string attach)
 {
@@ -54,7 +58,6 @@ StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id,
 
   StorageImpl* storage =
       new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, attach);
-  storageCreatedCallbacks(storage);
 
   XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(),
             Bread);
@@ -69,7 +72,7 @@ double StorageN11Model::next_occuring_event(double now)
 
 void StorageN11Model::update_actions_state(double /*now*/, double delta)
 {
-  for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+  for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
     StorageAction& action = static_cast<StorageAction&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
     action.update_remains(lrint(action.get_variable()->get_value() * delta));
@@ -79,7 +82,7 @@ void StorageN11Model::update_actions_state(double /*now*/, double delta)
 
     if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
         ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
-      action.finish(kernel::resource::Action::State::done);
+      action.finish(kernel::resource::Action::State::FINISHED);
     }
   }
 }
@@ -93,7 +96,7 @@ StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::Syste
     : StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach)
 {
   XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
-  simgrid::s4u::Storage::onCreation(this->piface_);
+  simgrid::s4u::Storage::on_creation(this->piface_);
 }
 
 StorageAction* StorageN11::read(sg_size_t size)
@@ -133,7 +136,7 @@ StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost,
 
 void StorageN11Action::cancel()
 {
-  set_state(Action::State::failed);
+  set_state(Action::State::FAILED);
 }
 
 void StorageN11Action::suspend()