X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86f0b802957d99f6262ce3336293d9b5f2e63890..19e1048a7009c4144b0f361ad85fb9dff44761ea:/src/s4u/s4u_Link.cpp

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index ba86b41b75..65d544b48d 100644
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -10,7 +10,7 @@
 #include "simgrid/s4u/Link.hpp"
 #include "simgrid/sg_config.hpp"
 #include "simgrid/simix.hpp"
-#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/SplitDuplexLinkImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/network_wifi.hpp"
 #include "xbt/log.h"
@@ -35,6 +35,14 @@ Link* Link::by_name(const std::string& name)
   return Engine::get_instance()->link_by_name(name);
 }
 
+kernel::resource::LinkImpl* Link::get_impl() const
+{
+  xbt_assert(
+      get_sharing_policy() != SharingPolicy::SPLITDUPLEX,
+      "Impossible to get a LinkImpl* from a Split-Duplex link. You should call this method to each UP/DOWN member");
+  return dynamic_cast<kernel::resource::LinkImpl*>(pimpl_);
+}
+
 Link* Link::by_name_or_null(const std::string& name)
 {
   return Engine::get_instance()->link_by_name_or_null(name);
@@ -96,7 +104,7 @@ Link* Link::set_sharing_policy(Link::SharingPolicy policy)
 {
   if (policy == SharingPolicy::SPLITDUPLEX)
     throw std::invalid_argument(std::string("Impossible to set split-duplex for the link: ") + get_name() +
-                                std::string(". You should create a link-up and link-down to emulate this behavior"));
+                                std::string(". Use NetZone::create_split_duplex_link."));
 
   kernel::actor::simcall([this, policy] { pimpl_->set_sharing_policy(policy); });
   return this;
@@ -113,6 +121,12 @@ void Link::set_host_wifi_rate(const s4u::Host* host, int level) const
   wlink->set_host_rate(host, level);
 }
 
+Link* Link::set_concurrency_limit(int limit)
+{
+  kernel::actor::simcall([this, limit] { pimpl_->set_concurrency_limit(limit); });
+  return this;
+}
+
 double Link::get_usage() const
 {
   return this->pimpl_->get_constraint()->get_usage();
@@ -179,6 +193,21 @@ Link* Link::set_properties(const std::unordered_map<std::string, std::string>& p
   return this;
 }
 
+Link* SplitDuplexLink::get_link_up() const
+{
+  return dynamic_cast<kernel::resource::SplitDuplexLinkImpl*>(pimpl_)->get_link_up();
+}
+
+Link* SplitDuplexLink::get_link_down() const
+{
+  return dynamic_cast<kernel::resource::SplitDuplexLinkImpl*>(pimpl_)->get_link_down();
+}
+
+SplitDuplexLink* SplitDuplexLink::by_name(const std::string& name)
+{
+  return Engine::get_instance()->split_duplex_link_by_name(name);
+}
+
 } // namespace s4u
 } // namespace simgrid
 
@@ -273,8 +302,8 @@ sg_link_t* sg_link_list()
 {
   std::vector<simgrid::s4u::Link*> links = simgrid::s4u::Engine::get_instance()->get_all_links();
 
-  sg_link_t* res = xbt_new(sg_link_t, links.size());
-  memcpy(res, links.data(), sizeof(sg_link_t) * links.size());
+  auto* res = xbt_new(sg_link_t, links.size());
+  std::copy(begin(links), end(links), res);
 
   return res;
 }