destroy all hosts before destroying the engine (fix #185)

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

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 552b4b0..2b4edf7 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,21 +1,23 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2017. 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/s4u/Host.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
 
 namespace simgrid {
 namespace kernel {
 
-EngineImpl::EngineImpl()
-{
-}
+EngineImpl::EngineImpl() = default;
 EngineImpl::~EngineImpl()
 {
-  delete rootAs_;
+  sg_host_exit(); // Hosts should be part of the engine, at some point
+  delete netRoot_;
+  for (auto kv : netpoints_)
+    delete kv.second;
 }
 }
 }