From 0ed6811d03131627a803f86b0a6a47796374e442 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 11 Apr 2019 22:08:26 +0200 Subject: [PATCH] With a std::map, entries are already sorted by their keys. --- src/kernel/EngineImpl.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 77390cb070..3a96a578de 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -10,26 +10,16 @@ #include "src/surf/StorageImpl.hpp" #include "src/surf/network_interface.hpp" -#include - namespace simgrid { namespace kernel { 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 names; - for (auto const& kv : hosts_) - names.push_back(kv.second->get_name()); - - 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 */ delete netzone_root_; -- 2.20.1