X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d381feb9b44e9d94e608c9b389c453128d44dff..852c24f4be68f06bedf43688364f770e9319f3a0:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 4d98ab4ed8..24459fa638 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -4,12 +4,15 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/EngineImpl.hpp"
+#include "simgrid/Exception.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #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
 
 namespace simgrid {
 namespace kernel {
@@ -29,11 +32,42 @@ EngineImpl::~EngineImpl()
 
   for (auto const& kv : storages_)
     if (kv.second)
-      kv.second->get_impl()->destroy();
+      kv.second->destroy();
 
   for (auto const& kv : links_)
     if (kv.second)
-      kv.second->get_impl()->destroy();
+      kv.second->destroy();
 }
+
+void EngineImpl::load_deployment(const std::string& file)
+{
+  sg_platf_exit();
+  sg_platf_init();
+
+  surf_parse_open(file);
+  surf_parse();
+  surf_parse_close();
 }
+void EngineImpl::register_function(const std::string& name, xbt_main_func_t code)
+{
+  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
+    return xbt::wrap_main(code, std::move(args));
+  };
 }
+
+void EngineImpl::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+{
+  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
+    return std::bind(std::move(code), std::move(args));
+  };
+}
+
+void EngineImpl::register_default(xbt_main_func_t code)
+{
+  simix_global->default_function = [code](std::vector<std::string> args) {
+    return xbt::wrap_main(code, std::move(args));
+  };
+}
+
+} // namespace kernel
+} // namespace simgrid