SIMIX_run becomes EngineImpl::run

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

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index f619bf6..151c9ae 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -1,12 +1,17 @@
-/* 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. */
 
-#include <map>
+#ifndef SIMGRID_KERNEL_ENGINEIMPL_HPP
+#define SIMGRID_KERNEL_ENGINEIMPL_HPP
+
+#include <simgrid/kernel/resource/Model.hpp>
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/NetZone.hpp>
 #include <simgrid/simix.hpp>
+
+#include <map>
 #include <string>
 #include <unordered_map>
 
@@ -14,12 +19,14 @@ namespace simgrid {
 namespace kernel {
 
 class EngineImpl {
-  std::map<std::string, s4u::Host*> hosts_;
-  std::map<std::string, resource::LinkImpl*> links_;
-  std::map<std::string, resource::StorageImpl*> storages_;
+  std::map<std::string, s4u::Host*, std::less<>> hosts_;
+  std::map<std::string, resource::LinkImpl*, std::less<>> links_;
   std::unordered_map<std::string, routing::NetPoint*> netpoints_;
   std::unordered_map<std::string, actor::ActorCodeFactory> registered_functions; // Maps function names to actor code
   actor::ActorCodeFactory default_function; // Function to use as a fallback when the provided name matches nothing
+  std::vector<resource::Model*> models_;
+  std::unordered_map<std::string, std::shared_ptr<resource::Model>> models_prio_;
+  routing::NetZoneImpl* netzone_root_ = nullptr;
 
   friend s4u::Engine;
 
@@ -30,11 +37,22 @@ public:
   EngineImpl& operator=(const EngineImpl&) = delete;
   virtual ~EngineImpl();
 
-  void load_deployment(const std::string& file);
+  void load_deployment(const std::string& file) const;
   void register_function(const std::string& name, const actor::ActorCodeFactory& code);
   void register_default(const actor::ActorCodeFactory& code);
 
-  routing::NetZoneImpl* netzone_root_ = nullptr;
+  /**
+   * @brief Add a model to engine list
+   *
+   * @param model Pointer to model
+   * @param list  List of dependencies for this model
+   */
+  void add_model(std::shared_ptr<simgrid::kernel::resource::Model> model,
+                 const std::vector<resource::Model*>& dep_models = {});
+
+  /** @brief Get list of all models managed by this engine */
+  const std::vector<resource::Model*>& get_all_models() const { return models_; }
+
   static EngineImpl* get_instance() { return simgrid::s4u::Engine::get_instance()->pimpl; }
   actor::ActorCodeFactory get_function(const std::string& name)
   {
@@ -44,7 +62,12 @@ public:
     else
       return res->second;
   }
+
+  /** @brief Run the main simulation loop. */
+  void run();
 };
 
 } // namespace kernel
 } // namespace simgrid
+
+#endif