X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1910eb3996b33f7e42fea6b093485600e04a567a..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/s4u/s4u_Netzone.cpp

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 90dedc88c7..b17d6a38d2 100644
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -1,23 +1,26 @@
-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2022. 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"
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/NetZone.hpp>
+#include <simgrid/simix.hpp>
+#include <simgrid/zone.h>
+#include <xbt/parse_units.hpp>
+
+#include "src/kernel/resource/LinkImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 
 namespace simgrid {
 namespace s4u {
 
 xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                  kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                 std::vector<kernel::resource::LinkImpl*> const& link_list)>
+                 std::vector<kernel::resource::StandardLinkImpl*> const& link_list)>
     NetZone::on_route_creation;
 xbt::signal<void(NetZone const&)> NetZone::on_creation;
 xbt::signal<void(NetZone const&)> NetZone::on_seal;
@@ -47,7 +50,7 @@ std::vector<NetZone*> NetZone::get_children() const
   return res;
 }
 
-NetZone* NetZone::add_child(NetZone* new_zone)
+NetZone* NetZone::add_child(NetZone* new_zone) // XBT_ATTRIB_DEPRECATED_v332
 {
   new_zone->set_parent(this);
   return this;
@@ -63,11 +66,6 @@ const char* NetZone::get_cname() const
   return pimpl_->get_cname();
 }
 
-NetZone* NetZone::get_father()
-{
-  return pimpl_->get_parent()->get_iface();
-}
-
 NetZone* NetZone::get_parent() const
 {
   return pimpl_->get_parent()->get_iface();
@@ -94,38 +92,50 @@ int NetZone::get_host_count() const
   return pimpl_->get_host_count();
 }
 
-int NetZone::add_component(kernel::routing::NetPoint* elm)
+unsigned long 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)
+// XBT_ATTRIB_DEPRECATED_v332
+std::vector<LinkInRoute>
+NetZone::convert_to_linkInRoute(const std::vector<kernel::resource::StandardLinkImpl*>& link_list)
 {
-  std::vector<kernel::resource::LinkImpl*> links;
-  for (const auto& link : link_list) {
-    links.push_back(link->get_impl());
+  std::vector<LinkInRoute> links;
+  for (const auto* link : link_list) {
+    links.emplace_back(LinkInRoute(link->get_iface()));
   }
   return links;
 }
 
 void NetZone::add_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)
+                        const std::vector<LinkInRoute>& link_list, bool symmetrical)
 {
-  pimpl_->add_route(src, dst, gw_src, gw_dst, NetZone::get_link_list_impl(link_list), symmetrical);
+  pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
 }
 
+// XBT_ATTRIB_DEPRECATED_v332
 void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                         kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                        const std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+                        const std::vector<kernel::resource::StandardLinkImpl*>& link_list, bool symmetrical)
 {
-  pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+  pimpl_->add_route(src, dst, gw_src, gw_dst, convert_to_linkInRoute(link_list), symmetrical);
+}
+
+// XBT_ATTRIB_DEPRECATED_v332
+void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+                               kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+                               const std::vector<kernel::resource::StandardLinkImpl*>& link_list, bool /*symmetrical*/)
+{
+  pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, convert_to_linkInRoute(link_list));
 }
+
 void NetZone::add_bypass_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<LinkInRoute>& link_list)
 {
-  pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+  pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list);
 }
 
 void NetZone::extract_xbt_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
@@ -179,13 +189,31 @@ s4u::Link* NetZone::create_link(const std::string& name, const std::string& band
   return create_link(name, std::vector<std::string>{bandwidth});
 }
 
+s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name, const std::string& bandwidth)
+{
+  double speed;
+  try {
+    speed = xbt_parse_get_bandwidth("", 0, bandwidth, "");
+  } catch (const simgrid::ParseError&) {
+    throw std::invalid_argument(std::string("Impossible to create split-duplex link: ") + name +
+                                std::string(". Invalid bandwidth: ") + bandwidth);
+  }
+  return create_split_duplex_link(name, speed);
+}
+
+s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name, double bandwidth)
+{
+  return kernel::actor::simcall(
+      [this, &name, &bandwidth] { return pimpl_->create_split_duplex_link(name, std::vector<double>{bandwidth}); });
+}
+
 s4u::Link* NetZone::create_link(const std::string& name, const std::vector<std::string>& bandwidths)
 {
   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, "");
+      double speed = xbt_parse_get_bandwidth("", 0, speed_str, "");
       bw.push_back(speed);
     } catch (const simgrid::ParseError&) {
       throw std::invalid_argument(std::string("Impossible to create link: ") + name +
@@ -204,6 +232,12 @@ kernel::routing::NetPoint* NetZone::get_netpoint()
 {
   return pimpl_->get_netpoint();
 }
+
+kernel::resource::NetworkModelIntf* NetZone::get_network_model() const
+{
+  kernel::resource::NetworkModelIntf* model = pimpl_->get_network_model().get();
+  return model;
+}
 } // namespace s4u
 } // namespace simgrid