Constify list of links parameter

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

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 6109f66..fa6f0c2 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -1,13 +1,16 @@
-/* Copyright (c) 2006-2020. 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. */
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
+#include "simgrid/simix.hpp"
 #include "simgrid/zone.h"
+#include "xbt/parse_units.hpp"
 
 namespace simgrid {
 namespace s4u {
@@ -44,17 +47,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)
@@ -77,9 +99,31 @@ int NetZone::add_component(kernel::routing::NetPoint* elm)
   return pimpl_->add_component(elm);
 }
 
+std::vector<kernel::resource::LinkImpl*> NetZone::get_link_list_impl(const std::vector<Link*> link_list)
+{
+  std::vector<kernel::resource::LinkImpl*> links;
+  for (const auto& link : link_list) {
+    links.push_back(link->get_impl());
+  }
+  return links;
+}
+
+void NetZone::add_regular_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+                                const std::vector<Link*>& link_list, bool symmetrical)
+{
+  add_route(src, dst, nullptr, nullptr, NetZone::get_link_list_impl(link_list), symmetrical);
+}
+
+void NetZone::add_netzone_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+                                kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+                                const std::vector<Link*>& link_list, bool symmetrical)
+{
+  add_route(src, dst, gw_src, gw_dst, NetZone::get_link_list_impl(link_list), symmetrical);
+}
+
 void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                         kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                        std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+                        const std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
 {
   pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
 }
@@ -90,14 +134,49 @@ 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>* nodes,
-                                std::map<std::string, xbt_edge_t>* edges)
+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);
 }
+
+s4u::Host* NetZone::create_host(const std::string& name, const std::vector<double>& speed_per_pstate)
+{
+  return kernel::actor::simcall(
+      [this, &name, &speed_per_pstate] { return pimpl_->create_host(name, speed_per_pstate); });
+}
+s4u::Host* NetZone::create_host(const std::string& name, const std::vector<std::string>& speed_per_pstate)
+{
+  return create_host(name, Host::convert_pstate_speed_vector(speed_per_pstate));
+}
+
+s4u::Link* NetZone::create_link(const std::string& name, const std::vector<double>& bandwidths,
+                                s4u::Link::SharingPolicy policy)
+{
+  return kernel::actor::simcall(
+      [this, &name, &bandwidths, &policy] { return pimpl_->create_link(name, bandwidths, policy); });
+}
+
+s4u::Link* NetZone::create_link(const std::string& name, const std::vector<std::string>& bandwidths,
+                                s4u::Link::SharingPolicy policy)
+{
+  std::vector<double> bw;
+  bw.reserve(bandwidths.size());
+  for (const auto& speed_str : bandwidths) {
+    try {
+      double speed = xbt_parse_get_bandwidth("", 0, speed_str.c_str(), nullptr, "");
+      bw.push_back(speed);
+    } catch (const simgrid::ParseError&) {
+      throw std::invalid_argument(std::string("Impossible to create link: ") + name +
+                                  std::string(". Invalid bandwidth: ") + speed_str);
+    }
+  }
+  return create_link(name, bw, policy);
+}
+
 } // namespace s4u
 } // namespace simgrid
 
@@ -121,7 +200,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);
   }
 }