X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41f97f763bc1771fe15e96ffcd4ff3e7c76a9a63..b9625f82f86db0674e911887addce45dca31b57f:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 9fa10c8a12..8cf08b7afe 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,38 +1,29 @@
-/* Copyright (c) 2016-2018. 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 "simgrid/s4u/Link.hpp"
+#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/simix/smx_private.hpp"
 #include "src/surf/StorageImpl.hpp"
-
-#include <algorithm>
+#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 {
 
-EngineImpl::EngineImpl() = default;
 EngineImpl::~EngineImpl()
 {
-  /* copy all names to not modify the map while iterating over it.
-   *
-   * Plus, the hosts are destroyed in the lexicographic order to ensure
-   * that the output is reproducible: we don't want to kill them in the
-   * pointer order as it could be platform-dependent, which would break
-   * the tests.
+  /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
+   * reproducible.
    */
-  std::vector<std::string> names;
-  for (auto const& kv : hosts_)
-    names.push_back(kv.second->get_name());
-
-  std::sort(names.begin(), names.end());
-
-  for (auto const& name : names)
-    hosts_.at(name)->destroy();
+  while (not hosts_.empty())
+    hosts_.begin()->second->destroy();
 
   /* Also delete the other data */
   delete netzone_root_;
@@ -41,10 +32,31 @@ EngineImpl::~EngineImpl()
 
   for (auto const& kv : storages_)
     if (kv.second)
-      kv.second->getImpl()->destroy();
+      kv.second->destroy();
+
   for (auto const& kv : links_)
     if (kv.second)
-      (kv.second)->destroy();
+      kv.second->destroy();
+}
+
+void EngineImpl::load_deployment(const std::string& file) const
+{
+  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