-/* 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/NetCard.hpp"
-#include "src/kernel/routing/NetZoneImpl.hpp"
-#include <simgrid/s4u/host.hpp>
-
-xbt_dict_t netcards_dict;
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/network_interface.hpp"
namespace simgrid {
namespace kernel {
-EngineImpl::EngineImpl()
-{
- netcards_dict = xbt_dict_new_homogeneous([](void* p) {
- delete static_cast<simgrid::kernel::routing::NetCard*>(p);
- });
-}
EngineImpl::~EngineImpl()
{
- delete netRoot_;
- xbt_dict_free(&netcards_dict);
+ /* 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();
}
}
}