-/* Copyright (c) 2016-2018. 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/NetZoneImpl.hpp"
#include "src/surf/StorageImpl.hpp"
+#include "src/surf/network_interface.hpp"
#include <algorithm>
*/
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());
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();
}
}
}