X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1386d9951c6653d682ba02d5ed9155485acf4f64..27ef78997bbc722303efdb9826ea745a3814a82a:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index a4405ff0d0..28f993c4b7 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,15 +1,18 @@
-/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2020. 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 "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 {
@@ -27,17 +30,33 @@ EngineImpl::~EngineImpl()
   for (auto const& kv : netpoints_)
     delete kv.second;
 
-  for (auto const& kv : disks_)
-    if (kv.second)
-      kv.second->get_impl()->destroy();
-
   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, const actor::ActorCodeFactory& code)
+{
+  registered_functions[name] = code;
 }
+void EngineImpl::register_default(const actor::ActorCodeFactory& code)
+{
+  default_function = code;
 }
+
+} // namespace kernel
+} // namespace simgrid