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

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index df3b8939d0..34efc84bb0 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,12 +1,14 @@
-/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2018. 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>
 
@@ -25,7 +27,7 @@ EngineImpl::~EngineImpl()
    */
   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());
 
@@ -33,9 +35,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)
+      kv.second->get_impl()->destroy();
+
+  for (auto const& kv : links_)
+    if (kv.second)
+      kv.second->get_impl()->destroy();
 }
 }
 }