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

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index c05e8a5c33..e25812ce16 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -13,15 +13,15 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
 /*************
  * CallBacks *
  *************/
-extern std::map<std::string, storage_type_t> storage_types;
+extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
 
 static void check_disk_attachment()
 {
-  for (auto s : *simgrid::surf::StorageImpl::storagesMap()) {
+  for (auto const& s : *simgrid::surf::StorageImpl::storagesMap()) {
     simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s.second->getHost().c_str());
     if (not host_elm)
-      surf_parse_error("Unable to attach storage %s: host %s does not exist.", s.second->cname(),
-                       s.second->getHost().c_str());
+      surf_parse_error(std::string("Unable to attach storage ") + s.second->getCname() + ": host " +
+                       s.second->getHost() + " does not exist.");
     else
       s.second->piface_.attached_to_ = sg_host_by_name(s.second->getHost().c_str());
   }
@@ -49,7 +49,7 @@ namespace surf {
 StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name,
                                             std::string attach)
 {
-  storage_type_t storage_type = storage_types.at(type_id);
+  StorageType* storage_type = storage_types.at(type_id);
 
   double Bread = surf_parse_get_bandwidth(storage_type->model_properties->at("Bread").c_str(),
                                           "property Bread, storage", type_id.c_str());
@@ -89,8 +89,8 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       action->file_->incrPosition(current_progress);
       action->file_->setSize(action->file_->tell());
 
-      action->storage_->getContent()->erase(action->file_->cname());
-      action->storage_->getContent()->insert({action->file_->cname(), action->file_->size()});
+      action->storage_->getContent()->erase(action->file_->getCname());
+      action->storage_->getContent()->insert({action->file_->getCname(), action->file_->size()});
     }
 
     if (action->getMaxDuration() > NO_MAX_DURATION)
@@ -98,12 +98,10 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
 
     if (action->getRemainsNoUpdate() > 0 && lmm_get_variable_weight(action->getVariable()) > 0 &&
         action->storage_->usedSize_ == action->storage_->getSize()) {
-      action->finish();
-      action->setState(Action::State::failed);
+      action->finish(Action::State::failed);
     } else if (((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
                ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
-      action->finish();
-      action->setState(Action::State::done);
+      action->finish(Action::State::done);
     }
   }
 }
@@ -138,7 +136,7 @@ StorageN11Action::StorageN11Action(Model* model, double cost, bool failed, Stora
                                    e_surf_action_storage_type_t type)
     : StorageAction(model, cost, failed, lmm_variable_new(model->getMaxminSystem(), this, 1.0, -1.0, 3), storage, type)
 {
-  XBT_IN("(%s,%g", storage->cname(), cost);
+  XBT_IN("(%s,%g", storage->getCname(), cost);
 
   // Must be less than the max bandwidth for all actions
   lmm_expand(model->getMaxminSystem(), storage->constraint(), getVariable(), 1.0);