namespacing

[simgrid.git] / src / kernel / EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 8cf08b7afe3d7506fe891a0d5be54ad70b00cf84..b6b12995d3193e51136bbd342d041ec6566d4a66 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,7 +10,6 @@
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/simix/smx_private.hpp"
-#include "src/surf/StorageImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
@@ -30,10 +29,6 @@ EngineImpl::~EngineImpl()
   for (auto const& kv : netpoints_)
     delete kv.second;
 
-  for (auto const& kv : storages_)
-    if (kv.second)
-      kv.second->destroy();
-
   for (auto const& kv : links_)
     if (kv.second)
       kv.second->destroy();
@@ -58,5 +53,27 @@ void EngineImpl::register_default(const actor::ActorCodeFactory& code)
   default_function = code;
 }
 
+void EngineImpl::add_model_ptask(resource::Model::Type type, resource::Model* model, bool is_default)
+{
+  if (is_default)
+    models_by_type_[type].insert(models_by_type_[type].begin(), model);
+  else
+    models_by_type_[type].push_back(model);
+}
+
+void EngineImpl::add_model(resource::Model::Type type, std::unique_ptr<resource::Model> model, bool is_default)
+{
+  add_model_ptask(type, model.get(), is_default);
+  models_.push_back(std::move(model));
+}
+
+resource::Model* EngineImpl::get_default_model(resource::Model::Type type)
+{
+  if (models_by_type_[type].size() > 0)
+    return models_by_type_[type][0];
+  else
+    return nullptr;
+}
+
 } // namespace kernel
 } // namespace simgrid