X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/s4u/s4u_Link.cpp

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index 9c6d41a8c9..ff36c714b7 100644
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -1,20 +1,18 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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 <algorithm>
+#include <simgrid/Exception.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Link.hpp>
+#include <simgrid/simix.hpp>
+#include <xbt/config.hpp>
+#include <xbt/parse_units.hpp>
 
-#include "simgrid/Exception.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Link.hpp"
-#include "simgrid/sg_config.hpp"
-#include "simgrid/simix.hpp"
-#include "src/surf/SplitDuplexLinkImpl.hpp"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/network_wifi.hpp"
-#include "xbt/log.h"
-#include "xbt/parse_units.hpp"
+#include "src/kernel/resource/LinkImpl.hpp"
+#include "src/kernel/resource/SplitDuplexLinkImpl.hpp"
+#include "src/kernel/resource/WifiLinkImpl.hpp"
 
 namespace simgrid {
 
@@ -26,7 +24,6 @@ xbt::signal<void(Link&)> Link::on_creation;
 xbt::signal<void(Link const&)> Link::on_destruction;
 xbt::signal<void(Link const&)> Link::on_state_change;
 xbt::signal<void(Link const&)> Link::on_bandwidth_change;
-xbt::signal<void(kernel::resource::NetworkAction&)> Link::on_communicate;
 xbt::signal<void(kernel::resource::NetworkAction&, kernel::resource::Action::State)>
     Link::on_communication_state_change;
 
@@ -35,9 +32,9 @@ Link* Link::by_name(const std::string& name)
   return Engine::get_instance()->link_by_name(name);
 }
 
-kernel::resource::LinkImpl* Link::get_impl() const
+kernel::resource::StandardLinkImpl* Link::get_impl() const
 {
-  auto* link_impl = dynamic_cast<kernel::resource::LinkImpl*>(pimpl_);
+  auto* link_impl = dynamic_cast<kernel::resource::StandardLinkImpl*>(pimpl_);
   xbt_assert(link_impl != nullptr, "Impossible to get a LinkImpl* from link. %s.",
              (get_sharing_policy() == SharingPolicy::SPLITDUPLEX
                   ? "For a Split-Duplex link, you should call this method to each UP/DOWN member"
@@ -118,7 +115,7 @@ Link::SharingPolicy Link::get_sharing_policy() const
 
 void Link::set_host_wifi_rate(const s4u::Host* host, int level) const
 {
-  auto* wlink = dynamic_cast<kernel::resource::NetworkWifiLink*>(pimpl_);
+  auto* wlink = dynamic_cast<kernel::resource::WifiLinkImpl*>(pimpl_);
   xbt_assert(wlink != nullptr, "Link %s does not seem to be a wifi link.", get_cname());
   wlink->set_host_rate(host, level);
 }
@@ -145,6 +142,7 @@ void Link::turn_off()
 Link* Link::seal()
 {
   kernel::actor::simcall([this]() { this->pimpl_->seal(); });
+  s4u::Link::on_creation(*this); // notify the signal
   return this;
 }
 
@@ -224,11 +222,6 @@ const char* sg_link_get_name(const_sg_link_t link)
   return link->get_cname();
 }
 
-const char* sg_link_name(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_link_get_name(link);
-}
-
 sg_link_t sg_link_by_name(const char* name)
 {
   return simgrid::s4u::Link::by_name(name);
@@ -249,16 +242,6 @@ void sg_link_set_bandwidth(sg_link_t link, double value)
   link->set_bandwidth(value);
 }
 
-double sg_link_bandwidth(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_link_get_bandwidth(link);
-}
-
-void sg_link_bandwidth_set(sg_link_t link, double value) // XBT_ATTRIB_DEPRECATED_v330
-{
-  sg_link_set_bandwidth(link, value);
-}
-
 double sg_link_get_latency(const_sg_link_t link)
 {
   return link->get_latency();
@@ -269,19 +252,9 @@ void sg_link_set_latency(sg_link_t link, double value)
   link->set_latency(value);
 }
 
-double sg_link_latency(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_link_get_latency(link);
-}
-
-void sg_link_latency_set(sg_link_t link, double value) // XBT_ATTRIB_DEPRECATED_v330
-{
-  sg_link_set_latency(link, value);
-}
-
 void* sg_link_get_data(const_sg_link_t link)
 {
-  return link->get_data();
+  return link->get_data<void>();
 }
 
 void sg_link_set_data(sg_link_t link, void* data)
@@ -289,16 +262,6 @@ void sg_link_set_data(sg_link_t link, void* data)
   link->set_data(data);
 }
 
-void* sg_link_data(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_link_get_data(link);
-}
-
-void sg_link_data_set(sg_link_t link, void* data) // XBT_ATTRIB_DEPRECATED_v330
-{
-  sg_link_set_data(link, data);
-}
-
 size_t sg_link_count()
 {
   return simgrid::s4u::Engine::get_instance()->get_link_count();