remove Link::on_communicate (use CommImpl::on_start instead)

diff --git a/docs/source/Plugins.rst b/docs/source/Plugins.rst
index 2530e77..a128573 100644 (file)
--- a/docs/source/Plugins.rst
+++ b/docs/source/Plugins.rst
@@ -98,7 +98,6 @@ Partial list of existing signals in s4u:
   :cpp:member:`Link::on_destruction <simgrid::s4u::Link::on_destruction>`
   :cpp:member:`Link::on_state_change <simgrid::s4u::Link::on_state_change>`
   :cpp:member:`Link::on_speed_change <simgrid::s4u::Link::on_bandwidth_change>`
-  :cpp:member:`Link::on_communicate <simgrid::s4u::Link::on_communicate>`
   :cpp:member:`Link::on_communication_state_change <simgrid::s4u::Link::on_communication_state_change>`
 - :cpp:member:`NetZone::on_creation <simgrid::s4u::NetZone::on_creation>`
   :cpp:member:`NetZone::on_seal <simgrid::s4u::NetZone::on_seal>`

diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst
index b8b7849..a28efe8 100644 (file)
--- a/docs/source/app_s4u.rst
+++ b/docs/source/app_s4u.rst
@@ -1579,7 +1579,6 @@ Signals
    .. group-tab:: C++
 
       .. doxygenvariable:: simgrid::s4u::Link::on_bandwidth_change
-      .. doxygenvariable:: simgrid::s4u::Link::on_communicate
       .. doxygenvariable:: simgrid::s4u::Link::on_communication_state_change
       .. doxygenvariable:: simgrid::s4u::Link::on_creation
       .. doxygenvariable:: simgrid::s4u::Link::on_destruction

diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index 8e144d9..5d89a0b 100644 (file)
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.hpp
@@ -147,9 +147,6 @@ public:
   /** @brief Callback signal fired when the bandwidth of a Link changes */
   static xbt::signal<void(Link const&)> on_bandwidth_change;
 
-  /** @brief Callback signal fired when a communication starts */
-  static xbt::signal<void(kernel::resource::NetworkAction&)> on_communicate;
-
   /** @brief Callback signal fired when a communication changes it state (ready/done/cancel) */
   static xbt::signal<void(kernel::resource::NetworkAction&, kernel::resource::Action::State)>
       on_communication_state_change;

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index 63b1dac..8391962 100644 (file)
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -24,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;
 

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 753f2a6..817f809 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -438,7 +438,6 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
   comm_action_expand_constraints(src, dst, action, route, back_route);
   XBT_OUT();
 
-  simgrid::s4u::Link::on_communicate(*action);
   return action;
 }
 

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index fa25c66..b786a20 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -75,10 +75,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
 
 Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/)
 {
-  auto* action = new NetworkConstantAction(this, *src, *dst, size);
-
-  s4u::Link::on_communicate(*action);
-  return action;
+  return (new NetworkConstantAction(this, *src, *dst, size));
 }
 
 /**********

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index c339b66..4ff24be 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -542,8 +542,6 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s
   port_number = 1 + (port_number % UINT16_MAX);
   if (port_number == 1)
     XBT_WARN("Too many connections! Port number is saturated. Trying to use the oldest ports.");
-
-  s4u::Link::on_communicate(*this);
 }
 
 void NetworkNS3Action::suspend()