try to clean and uniformize Activity Impls

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

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index c8c4895..77390cb 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,32 +1,30 @@
-/* Copyright (c) 2016-2017. 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 "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #include "simgrid/s4u/Host.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/StorageImpl.hpp"
+#include "src/surf/network_interface.hpp"
 
 #include <algorithm>
 
 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.
+   * 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.
    */
   std::vector<std::string> names;
   for (auto const& kv : hosts_)
-    names.push_back(kv.second->getName());
+    names.push_back(kv.second->get_name());
 
   std::sort(names.begin(), names.end());
 
@@ -34,13 +32,17 @@ EngineImpl::~EngineImpl()
     hosts_.at(name)->destroy();
 
   /* Also delete the other data */
-  delete netRoot_;
+  delete netzone_root_;
   for (auto const& kv : netpoints_)
     delete kv.second;
 
   for (auto const& kv : storages_)
     if (kv.second)
-      delete kv.second->getImpl();
+      kv.second->get_impl()->destroy();
+
+  for (auto const& kv : links_)
+    if (kv.second)
+      kv.second->get_impl()->destroy();
 }
 }
 }