X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 897c3b7ab6..c9bcc38cb4 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -6,11 +6,9 @@
 #include "storage_n11.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/surf/xml/platf.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/utility.hpp"
-#include <cmath> /*ceil*/
+#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
 
@@ -19,9 +17,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
  *************/
 extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
 
-static void check_disk_attachment()
+void check_disk_attachment()
 {
-  for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
+  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->getImpl()->getHost().c_str());
     if (not host_elm)
       surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
@@ -31,12 +29,6 @@ static void check_disk_attachment()
   }
 }
 
-void storage_register_callbacks()
-{
-  simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
-  instr_routing_define_callbacks();
-}
-
 /*********
  * Model *
  *********/
@@ -62,7 +54,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);
@@ -77,7 +68,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));
@@ -87,7 +78,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);
     }
   }
 }
@@ -101,17 +92,17 @@ 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)
 {
-  return new StorageN11Action(model(), size, isOff(), this, READ);
+  return new StorageN11Action(get_model(), size, is_off(), this, READ);
 }
 
 StorageAction* StorageN11::write(sg_size_t size)
 {
-  return new StorageN11Action(model(), size, isOff(), this, WRITE);
+  return new StorageN11Action(get_model(), size, is_off(), this, WRITE);
 }
 
 /**********
@@ -125,7 +116,7 @@ StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost,
   XBT_IN("(%s,%g", storage->get_cname(), cost);
 
   // Must be less than the max bandwidth for all actions
-  model->get_maxmin_system()->expand(storage->constraint(), get_variable(), 1.0);
+  model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0);
   switch(type) {
   case READ:
     model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);
@@ -141,7 +132,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()