With a std::map, entries are already sorted by their keys.

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

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 552b4b0..3a96a57 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,21 +1,38 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2019. 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 "src/kernel/routing/AsImpl.hpp"
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/network_interface.hpp"
 
 namespace simgrid {
 namespace kernel {
 
-EngineImpl::EngineImpl()
-{
-}
 EngineImpl::~EngineImpl()
 {
-  delete rootAs_;
+  /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
+   * reproducible.
+   */
+  while (not hosts_.empty())
+    hosts_.begin()->second->destroy();
+
+  /* Also delete the other data */
+  delete netzone_root_;
+  for (auto const& kv : netpoints_)
+    delete kv.second;
+
+  for (auto const& kv : storages_)
+    if (kv.second)
+      kv.second->get_impl()->destroy();
+
+  for (auto const& kv : links_)
+    if (kv.second)
+      kv.second->get_impl()->destroy();
 }
 }
 }