A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ahem. You mean I need to actually compile with MC after moving files?
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index
abda1e2
..
3a96a57
100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2016-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-201
9
. 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. */
/* 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. */
@@
-8,39
+8,31
@@
#include "simgrid/kernel/routing/NetZoneImpl.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/surf/StorageImpl.hpp"
#include "simgrid/kernel/routing/NetZoneImpl.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/surf/StorageImpl.hpp"
-
-#include <algorithm>
+#include "src/surf/network_interface.hpp"
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
-EngineImpl::EngineImpl() = default;
EngineImpl::~EngineImpl()
{
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.
+ /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
+ * reproducible.
*/
*/
- std::vector<std::string> names;
- for (auto const& kv : hosts_)
- names.push_back(kv.second->getName());
-
- std::sort(names.begin(), names.end());
-
- for (auto const& name : names)
- hosts_.at(name)->destroy();
+ while (not hosts_.empty())
+ hosts_.begin()->second->destroy();
/* Also delete the other data */
/* Also delete the other data */
- delete net
R
oot_;
+ delete net
zone_r
oot_;
for (auto const& kv : netpoints_)
delete kv.second;
for (auto const& kv : storages_)
if (kv.second)
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();
}
}
}
}
}
}