[sonar] Useless parentheses.

[simgrid.git] / src / s4u / s4u_Netzone.cpp

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index acf827eaade88a69f80b4fd346129465bef671c7..590522929a29825038c6daeb88cd9e602fc64fb2 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2021. 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. */
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
+#include "simgrid/simix.hpp"
 #include "simgrid/zone.h"
 
 namespace simgrid {
@@ -44,17 +45,36 @@ std::vector<NetZone*> NetZone::get_children() const
   return res;
 }
 
+NetZone* NetZone::add_child(const NetZone* new_zone)
+{
+  pimpl_->add_child(new_zone->get_impl());
+  return this;
+}
+
 const std::string& NetZone::get_name() const
 {
   return pimpl_->get_name();
 }
+
 const char* NetZone::get_cname() const
 {
   return pimpl_->get_cname();
 }
+
 NetZone* NetZone::get_father()
 {
-  return pimpl_->get_father()->get_iface();
+  return pimpl_->get_parent()->get_iface();
+}
+
+NetZone* NetZone::get_parent() const
+{
+  return pimpl_->get_parent()->get_iface();
+}
+
+NetZone* NetZone::set_parent(const NetZone* parent)
+{
+  pimpl_->set_parent(parent->get_impl());
+  return this;
 }
 
 /** @brief Returns the list of the hosts found in this NetZone (not recursively)
@@ -67,7 +87,7 @@ std::vector<Host*> NetZone::get_all_hosts() const
   return pimpl_->get_all_hosts();
 }
 
-int NetZone::get_host_count()
+int NetZone::get_host_count() const
 {
   return pimpl_->get_host_count();
 }
@@ -89,6 +109,15 @@ void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::
 {
   pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
 }
+
+void NetZone::extract_xbt_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
+                                std::map<std::string, xbt_edge_t, std::less<>>* edges)
+{
+  for (auto const& child : get_children())
+    child->extract_xbt_graph(graph, nodes, edges);
+
+  pimpl_->get_graph(graph, nodes, edges);
+}
 } // namespace s4u
 } // namespace simgrid
 
@@ -112,7 +141,7 @@ sg_netzone_t sg_zone_get_by_name(const char* name)
 void sg_zone_get_sons(const_sg_netzone_t netzone, xbt_dict_t whereto)
 {
   for (auto const& elem : netzone->get_children()) {
-    xbt_dict_set(whereto, elem->get_cname(), static_cast<void*>(elem));
+    xbt_dict_set(whereto, elem->get_cname(), elem);
   }
 }