It seems important to keep destruction order for hosts and links.

Keep a "determinist" behavior based on the map order.

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index 65e37e0..d0c312a 100644 (file)
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -77,13 +77,7 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder {
 
   // our content, as known to our graph routing algorithm (maps vertex_id -> vertex)
   std::vector<kernel::routing::NetPoint*> vertices_;
-  // would like to use the one defined in the StandardLinkImpl file, but for some reason
-  // this hpp is exported to the users and so cannot include the other internal hpp.
-  class ResourceDeleter {
-  public:
-    template <typename Resource> void operator()(Resource* res) const;
-  };
-  std::map<std::string, std::unique_ptr<resource::StandardLinkImpl, ResourceDeleter>, std::less<>> links_;
+  std::map<std::string, resource::StandardLinkImpl*, std::less<>> links_;
   /* save split-duplex links separately, keep links_ with only LinkImpl* seen by the user
    * members of a split-duplex are saved in the links_ */
   std::map<std::string, std::unique_ptr<resource::SplitDuplexLinkImpl>, std::less<>> split_duplex_links_;

diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp
index c9bdedd..cc37733 100644 (file)
--- a/src/kernel/routing/NetZoneImpl.cpp
+++ b/src/kernel/routing/NetZoneImpl.cpp
@@ -73,11 +73,6 @@ xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routi
                  std::vector<kernel::resource::StandardLinkImpl*> const& link_list)>
     NetZoneImpl::on_route_creation;
 
-template <typename Resource> void NetZoneImpl::ResourceDeleter::operator()(Resource* res) const
-{
-  res->destroy();
-}
-
 NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name)
 {
   auto* engine = s4u::Engine::get_instance();
@@ -114,13 +109,17 @@ NetZoneImpl::~NetZoneImpl()
   for (auto const& nz : children_)
     delete nz;
 
-  /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
-   * reproducible.
+  /* Since hosts_ and links_ are a std::map, the hosts are destroyed in the lexicographic order, which ensures that the
+   * output is reproducible.
    */
   for (auto& host : hosts_) {
     host.second->destroy();
   }
   hosts_.clear();
+  for (auto& link : links_) {
+    link.second->destroy();
+  }
+  links_.clear();
 
   for (auto const& kv : bypass_routes_)
     delete kv.second;
@@ -209,7 +208,7 @@ s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector<d
       "Impossible to create link: %s. Invalid network model: nullptr. Have you set the parent of this NetZone: %s?",
       name.c_str(), get_cname());
   xbt_assert(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
-  links_[name].reset(do_create_link(name, bandwidths)->set_englobing_zone(this));
+  links_[name] = do_create_link(name, bandwidths)->set_englobing_zone(this);
   return links_[name]->get_iface();
 }
 
@@ -295,7 +294,7 @@ resource::StandardLinkImpl* NetZoneImpl::get_link_by_name_or_null(const std::str
 {
   auto link_it = links_.find(name);
   if (link_it != links_.end())
-    return link_it->second.get();
+    return link_it->second;
 
   for (const auto* child : children_) {
     auto* link = child->get_link_by_name_or_null(name);