Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
have each model register into all_existing_models by itself
[simgrid.git] / src / surf / storage_n11.cpp
index c9bcc38..6a1f0db 100644 (file)
@@ -20,12 +20,12 @@ extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
 void check_disk_attachment()
 {
   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());
+    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)
 {