X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..db5adf7439201fb67d1d697b86806d58ace9fe85:/src/kernel/EngineImpl.hpp

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index 386e921edb..2e385c759b 100644
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -3,9 +3,14 @@
 /* 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/s4u/Engine.hpp>
 #include <simgrid/s4u/NetZone.hpp>
 #include <simgrid/simix.hpp>
+
+#include <map>
 #include <string>
 #include <unordered_map>
 
@@ -17,6 +22,9 @@ class EngineImpl {
   std::map<std::string, resource::LinkImpl*> links_;
   std::map<std::string, resource::StorageImpl*> storages_;
   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
+
   friend s4u::Engine;
 
 public:
@@ -26,13 +34,23 @@ public:
   EngineImpl& operator=(const EngineImpl&) = delete;
   virtual ~EngineImpl();
 
-  void load_deployment(const std::string& file);
-  void register_function(const std::string& name, xbt_main_func_t code);
-  void register_function(const std::string& name, void (*code)(std::vector<std::string>));
-  void register_default(xbt_main_func_t code);
+  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;
+  static EngineImpl* get_instance() { return simgrid::s4u::Engine::get_instance()->pimpl; }
+  actor::ActorCodeFactory get_function(const std::string& name)
+  {
+    auto res = registered_functions.find(name);
+    if (res == registered_functions.end())
+      return default_function;
+    else
+      return res->second;
+  }
 };
 
 } // namespace kernel
 } // namespace simgrid
+
+#endif