process -> actor

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

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index febaedf..1857b85 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -10,8 +10,10 @@
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/NetZone.hpp>
 #include <simgrid/simix.hpp>
+#include <xbt/functional.hpp>
 
 #include <map>
+#include <set>
 #include <string>
 #include <unordered_map>
 
@@ -25,12 +27,12 @@ class EngineImpl {
   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_;
-  struct ModelStruct {
-    int prio;
-    std::shared_ptr<resource::Model> ptr;
-  };
-  std::unordered_map<std::string, struct ModelStruct> models_prio_;
+  std::unordered_map<std::string, std::shared_ptr<resource::Model>> models_prio_;
   routing::NetZoneImpl* netzone_root_ = nullptr;
+  std::set<kernel::actor::ActorImpl*> daemons_;
+
+  std::vector<xbt::Task<void()>> tasks;
+  std::vector<xbt::Task<void()>> tasksTemp;
 
   friend s4u::Engine;
 
@@ -51,7 +53,8 @@ public:
    * @param model Pointer to model
    * @param list  List of dependencies for this model
    */
-  void add_model(std::shared_ptr<simgrid::kernel::resource::Model> model, std::vector<std::string>&& dep_models = {});
+  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_; }
@@ -65,6 +68,16 @@ public:
     else
       return res->second;
   }
+  void add_daemon(actor::ActorImpl* d) { daemons_.insert(d); }
+  void rm_daemon(actor::ActorImpl* d);
+
+  bool execute_tasks();
+  void add_task(xbt::Task<void()>&& t) { tasks.push_back(std::move(t)); }
+  void wake_all_waiting_actors() const;
+  void display_all_actor_status() const;
+
+  /** @brief Run the main simulation loop. */
+  void run();
 };
 
 } // namespace kernel